[Git][ghc/ghc][master] 2 commits: testsuite: Fix Windows line endings
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Thu Sep 21 16:59:03 UTC 2023
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
37ad04e8 by Ben Gamari at 2023-09-21T12:58:15-04:00
testsuite: Fix Windows line endings
- - - - -
5795b365 by Ben Gamari at 2023-09-21T12:58:15-04:00
testsuite: Use makefile_test
- - - - -
30 changed files:
- testsuite/tests/backpack/cabal/T14304/all.T
- testsuite/tests/backpack/cabal/T15594/all.T
- testsuite/tests/backpack/cabal/T16219/all.T
- testsuite/tests/backpack/cabal/T20509/all.T
- testsuite/tests/backpack/cabal/bkpcabal01/all.T
- testsuite/tests/backpack/cabal/bkpcabal02/all.T
- testsuite/tests/backpack/cabal/bkpcabal03/all.T
- testsuite/tests/backpack/cabal/bkpcabal04/all.T
- testsuite/tests/backpack/cabal/bkpcabal05/all.T
- testsuite/tests/backpack/cabal/bkpcabal06/all.T
- testsuite/tests/backpack/cabal/bkpcabal08/all.T
- testsuite/tests/cabal/T12733/all.T
- testsuite/tests/cabal/cabal03/all.T
- testsuite/tests/cabal/cabal05/all.T
- testsuite/tests/cabal/cabal06/all.T
- testsuite/tests/cabal/cabal08/all.T
- testsuite/tests/cabal/cabal09/all.T
- testsuite/tests/cabal/cabal10/all.T
- testsuite/tests/cabal/sigcabal01/all.T
- testsuite/tests/cabal/t18567/all.T
- testsuite/tests/cabal/t19518/all.T
- testsuite/tests/cabal/t20242/all.T
- testsuite/tests/driver/T16500/all.T
- testsuite/tests/driver/dynamicToo/dynamicToo006/all.T
- testsuite/tests/driver/multipleHomeUnits/different-db/all.T
- testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T
- testsuite/tests/rts/T13287/all.T
- testsuite/tests/runghc/all.T
- testsuite/tests/showIface/all.T
- testsuite/tests/unboxedsums/module/all.T
Changes:
=====================================
testsuite/tests/backpack/cabal/T14304/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T14304',
[extra_files(['p', 'indef', 'th', 'Setup.hs']),
unless(have_dynamic(), skip)],
- run_command,
- ['$MAKE -s --no-print-directory T14304 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/T15594/all.T
=====================================
@@ -1,9 +1,4 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T15594',
[extra_files(['Setup.hs', 'Stuff.hs', 'Sig.hsig', 'pkg.cabal', 'src'])],
- run_command,
- ['$MAKE -s --no-print-directory T15594 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/T16219/all.T
=====================================
@@ -1,12 +1,7 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T16219',
[ extra_files(['Setup.hs', 'backpack-issue.cabal', 'library-a', 'library-a-impl', 'library-b'])
, when(opsys('mingw32'), fragile(17452))
, js_broken(22349)
],
- run_command,
- ['$MAKE -s --no-print-directory T16219 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/T20509/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T20509',
[extra_files(['p', 'q', 'T20509.cabal', 'Setup.hs'])
, run_timeout_multiplier(2)
],
- run_command,
- ['$MAKE -s --no-print-directory T20509 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal01/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('bkpcabal01',
[extra_files(['p', 'q', 'impl', 'bkpcabal01.cabal', 'Setup.hs', 'Main.hs']),
js_broken(22349),
run_timeout_multiplier(2)],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal01 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal02/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('bkpcabal02',
[extra_files(['p', 'q', 'bkpcabal02.cabal', 'Setup.hs']),
normalise_version('bkpcabal01')],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal02 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal03/all.T
=====================================
@@ -1,9 +1,4 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('bkpcabal03',
[extra_files(['asig1', 'asig2', 'bkpcabal03.cabal.in1', 'bkpcabal03.cabal.in2', 'Setup.hs', 'Mod.hs'])],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal03 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal04/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
# Test recompilation checking on signatures
test('bkpcabal04',
[extra_files(['p', 'q', 'bkpcabal04.cabal.in1', 'bkpcabal04.cabal.in2', 'Setup.hs'])],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal04 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal05/all.T
=====================================
@@ -1,9 +1,4 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('bkpcabal05',
[extra_files(['bkpcabal05.cabal', 'A.hsig.in1', 'A.hsig.in2', 'M.hs', 'Setup.hs'])],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal05 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal06/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('bkpcabal06',
[extra_files(['bkpcabal06.cabal', 'Setup.hs', 'sig', 'impl']),
js_broken(22349),
when(opsys('mingw32'), skip)],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal06 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/backpack/cabal/bkpcabal08/all.T
=====================================
@@ -1,13 +1,8 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('bkpcabal08',
[extra_files(['p', 'q', 'impl', 'bkpcabal08.cabal', 'Setup.hs', 'R.hs']),
js_broken(22351),
fragile(23648),
normalise_slashes,
normalise_version('bkpcabal08')],
- run_command,
- ['$MAKE -s --no-print-directory bkpcabal08 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/T12733/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T12733',
[extra_files(['p/', 'q/', 'Setup.hs'])
, js_broken(22349)
],
- run_command,
- ['$MAKE -s --no-print-directory T12733 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/cabal03/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('cabal03',
[extra_files(['Setup.lhs', 'p/', 'q/', 'r/']),
js_broken(22349)],
- run_command,
- ['$MAKE -s --no-print-directory cabal03 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/cabal05/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('cabal05',
[extra_files(['Setup.hs', 'p/', 'q/', 'r/', 's/', 't/']),
js_broken(22349)],
- run_command,
- ['$MAKE -s --no-print-directory cabal05 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/cabal06/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('cabal06',
[extra_files(['Setup.hs', 'p-1.0/', 'p-1.1/', 'q/', 'r/']),
js_broken(22349)],
- run_command,
- ['$MAKE -s --no-print-directory cabal06 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/cabal08/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('cabal08',
[extra_files(['Main.hs', 'Setup.hs', 'p1/', 'p2/']),
js_broken(22349)],
- run_command,
- ['$MAKE -s --no-print-directory cabal08 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/cabal09/all.T
=====================================
@@ -1,9 +1 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
-test('cabal09',
- [extra_files(['Main.hs', 'Setup.hs', 'reexport.cabal'])],
- run_command,
- ['$MAKE -s --no-print-directory cabal09 ' + cleanup])
+test('cabal09', [extra_files(['Main.hs', 'Setup.hs', 'reexport.cabal'])], makefile_test, [])
=====================================
testsuite/tests/cabal/cabal10/all.T
=====================================
@@ -1,10 +1,5 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('cabal10',
[extra_files(['Use.hs', 'Setup.hs', 'src/', 'internal-lib.cabal']),
js_broken(22349)],
- run_command,
- ['$MAKE -s --no-print-directory cabal10 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/sigcabal01/all.T
=====================================
@@ -1,9 +1,4 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('sigcabal01',
[extra_files(['Main.hs', 'Setup.hs', 'p/']), expect_broken(10622)],
- run_command,
- ['$MAKE -s --no-print-directory sigcabal01 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/t18567/all.T
=====================================
@@ -1,12 +1,7 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T18567',
[ extra_files(['Setup.hs', 'sublib/', 'sublib-unused', 'src/', 'internal-lib.cabal'])
, js_broken(22349)
, normalise_version('internal-lib')
],
- run_command,
- ['$MAKE -s --no-print-directory T18567 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/t19518/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('t19518',
[ extra_files(['Setup.hs', 'p/', 'q/', 'r/'])
, js_broken(22349)
],
- run_command,
- ['$MAKE -s --no-print-directory t19518 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/cabal/t20242/all.T
=====================================
@@ -1,9 +1,4 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('T20242',
[extra_files(['Setup.hs', 'BootNoHeader.cabal','Foo.hs', 'Foo.hs-boot', 'Main.hs'])],
- run_command,
- ['$MAKE -s --no-print-directory T20242 ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/driver/T16500/all.T
=====================================
@@ -1 +1 @@
-test('T16500', [extra_files(['A.hs','B.hs',]),], run_command, ['$MAKE -s --no-print-directory T16500'])
+test('T16500', [extra_files(['A.hs','B.hs',]),], makefile_test, [])
=====================================
testsuite/tests/driver/dynamicToo/dynamicToo006/all.T
=====================================
@@ -1,3 +1,3 @@
test('dynamicToo006',
[normalise_slashes, extra_files(['Main.hs']), unless(have_dynamic(), skip)],
- run_command, ['$MAKE -s main --no-print-director'])
+ makefile_test, ['main'])
=====================================
testsuite/tests/driver/multipleHomeUnits/different-db/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('different-db',
[ extra_files(['p/', 'q/', 'r/', 'p1/', 'unitP', 'unitQ', 'unitR', 'unitP1', 'Setup.hs'])
, js_broken(22349)
],
- run_command,
- ['$MAKE -s --no-print-directory different-db ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/driver/multipleHomeUnits/mhu-closure/all.T
=====================================
@@ -1,11 +1,6 @@
-if config.cleanup:
- cleanup = 'CLEANUP=1'
-else:
- cleanup = 'CLEANUP=0'
-
test('mhu-closure',
[ extra_files(['p/', 'q/', 'r/', 'r1/', 'unitP', 'unitQ', 'unitR', 'unitR1', 'Setup.hs'])
, js_broken(22349)
],
- run_command,
- ['$MAKE -s --no-print-directory mhu-closure ' + cleanup])
+ makefile_test,
+ [])
=====================================
testsuite/tests/rts/T13287/all.T
=====================================
@@ -1,4 +1,4 @@
-# Ensure that RTS flags past -- get ignored
-
-test('T13287', [extra_run_opts('a1 +RTS -RTS -- a2 +RTS -RTS a3'), omit_ghci], compile_and_run, [''])
-
+# Ensure that RTS flags past -- get ignored
+
+test('T13287', [extra_run_opts('a1 +RTS -RTS -- a2 +RTS -RTS a3'), omit_ghci], compile_and_run, [''])
+
=====================================
testsuite/tests/runghc/all.T
=====================================
@@ -9,9 +9,9 @@ test('T6132', [],
test('T17171a',
[req_interp, exit_code(2), ignore_stdout, grep_errmsg(r'main')],
- run_command, ['$MAKE -s --no-print-directory T17171a'])
-test('T17171b', req_interp, run_command,
- ['$MAKE -s --no-print-directory T17171b'])
+ makefile_test, [])
+
+test('T17171b', req_interp, makefile_test, [])
test('T-signals-child',
[ when(opsys('mingw32'), skip), req_interp
=====================================
testsuite/tests/showIface/all.T
=====================================
@@ -1,39 +1,14 @@
test('Orphans', normal, makefile_test, ['Orphans'])
-test('DocsInHiFile0',
- extra_files(['DocsInHiFile.hs']),
- makefile_test, ['DocsInHiFile0'])
-test('DocsInHiFile1',
- extra_files(['DocsInHiFile.hs']),
- makefile_test, ['DocsInHiFile1'])
+test('DocsInHiFile0', extra_files(['DocsInHiFile.hs']), makefile_test, [])
+test('DocsInHiFile1', extra_files(['DocsInHiFile.hs']), makefile_test, [])
test('T17871', [extra_files(['T17871a.hs'])], multimod_compile, ['T17871', '-v0'])
test('DocsInHiFileTH',
[extra_files(['DocsInHiFileTHExternal.hs', 'DocsInHiFileTH.hs']), req_th],
- makefile_test, ['DocsInHiFileTH'])
-test('NoExportList',
- normal,
- run_command,
- ['$MAKE -s --no-print-directory NoExportList'])
-test('PragmaDocs',
- normal,
- run_command,
- ['$MAKE -s --no-print-directory PragmaDocs'])
-test('HaddockOpts',
- normal,
- run_command,
- ['$MAKE -s --no-print-directory HaddockOpts'])
-test('LanguageExts',
- normal,
- run_command,
- ['$MAKE -s --no-print-directory LanguageExts'])
-test('ReExports',
- extra_files(['Inner0.hs', 'Inner1.hs', 'Inner2.hs', 'Inner3.hs', 'Inner4.hs']),
- run_command,
- ['$MAKE -s --no-print-directory ReExports'])
-test('HaddockIssue849',
- normal,
- run_command,
- ['$MAKE -s --no-print-directory HaddockIssue849'])
-test('MagicHashInHaddocks',
- normal,
- run_command,
- ['$MAKE -s --no-print-directory MagicHashInHaddocks'])
+ makefile_test, [])
+test('NoExportList', normal, makefile_test, [])
+test('PragmaDocs', normal, makefile_test, [])
+test('HaddockOpts', normal, makefile_test, [])
+test('LanguageExts', normal, makefile_test, [])
+test('ReExports', extra_files(['Inner0.hs', 'Inner1.hs', 'Inner2.hs', 'Inner3.hs', 'Inner4.hs']), makefile_test, [])
+test('HaddockIssue849', normal, makefile_test, [])
+test('MagicHashInHaddocks', normal, makefile_test, [])
=====================================
testsuite/tests/unboxedsums/module/all.T
=====================================
@@ -1,2 +1,2 @@
test('sum_mod', [normalise_slashes, extra_files(['Lib.hs', 'Main.hs'])],
- run_command, ['$MAKE -s main --no-print-director'])
+ makefile_test, ['main'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b35fd2cd7a12f3354a7fd2301bdf610c5d435017...5795b365220abaa2e1cae77bb2c226c5df9d5d16
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b35fd2cd7a12f3354a7fd2301bdf610c5d435017...5795b365220abaa2e1cae77bb2c226c5df9d5d16
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230921/b45d71c6/attachment-0001.html>
More information about the ghc-commits
mailing list