tests: manually move some extra_files into *.T files

Some of the *.T files were in libraries/hpc, so this contains an
update to that submodule.

hpc @ 5caceac7

-Subproject commit c23cad32f408559ba95b880c04dc1a2c60ec3d01
+Subproject commit 5caceac7a05741f87f970e1d3f572b1fd8f10cec

testsuite/driver/extra_files.py

@@ -47,11 +47,6 @@ extra_src_files = {
   'T13163': ['Test13163.hs'],
   'T10420': ['rule-defining-plugin/'],
   'T10458': ['A.c'],
-  'T10529a': ['hpc_sample_non_existing_module.tix'],
-  'T10529b': ['.hpc/', 'hpc_sample_incompatible_hash.tix'],
-  'T10529c': ['.hpc/', 'hpc_sample_no_parse.tix'],
-  'T10576a': ['T10576.hs'],
-  'T10576b': ['T10576.hs'],
   'T10598':  ['Test10598.hs'],
   'T10637': ['A.hs', 'A.hs-boot'],
   'T10672_x64': ['Main.hs', 'Printf.hs', 'cxxy.cpp'],
@@ -84,7 +79,6 @@ extra_src_files = {
   'T11321': ['Test11321.hs'],
   'T11332': ['Test11332.hs'],
   'T11430': ['Test11430.hs', 't11430.hs'],
-  'T11824': ['TyCon.hs', 'Type.hs', 'Type.hs-boot', 'Unbound/'],
   'T11827': ['A.hs', 'A.hs-boot', 'B.hs'],
   'T12062': ['A.hs', 'A.hs-boot', 'C.hs'],
   'T12035j': ['T12035.hs', 'T12035a.hs', 'T12035.hs-boot'],
@@ -105,17 +99,11 @@ extra_src_files = {
   'T4891': ['X.hs'],
   'T5147': ['A.hs', 'B1.hs', 'B2.hs'],
   'T5250': ['spalign.c'],
-  'T5435_dyn_asm': ['T5435.hs', 'T5435_asm.c'],
   'T5435_dyn_gcc': ['T5435.hs', 'T5435_gcc.c'],
-  'T5435_v_asm': ['T5435.hs', 'T5435_asm.c'],
-  'T5435_v_gcc': ['T5435.hs', 'T5435_gcc.c'],
   'T5442a': ['test.pkg'],
   'T5442b': ['test.pkg'],
   'T5442c': ['test.pkg'],
   'T5442d': ['shadow1.pkg', 'shadow2.pkg', 'shadow4.pkg'],
-  'T5462No1': ['GFunctor/'],
-  'T5462Yes1': ['GEnum/', 'GEq/', 'GFunctor/'],
-  'T5462Yes2': ['GFunctor/'],
   'T5644': ['Conf.hs', 'ManyQueue.hs', 'Util.hs', 'heap-overflow.hs'],
   'T6018fail': ['T6018Afail.hs', 'T6018Bfail.hs', 'T6018Cfail.hs', 'T6018Dfail.hs'],
   'T6106': ['../shell.hs'],
@@ -134,7 +122,6 @@ extra_src_files = {
   'T9562': ['A.hs', 'B.hs', 'B.hs-boot', 'C.hs', 'D.hs', 'Main.hs'],
   'T9619': ['.hpc', '.hpc.copy', 'hpc_sample.tix'],
   'T9646': ['Main.hs', 'Natural.hs', 'StrictPrim.hs', 'Type.hs'],
-  'T9930fail': ['T9930'],
   'TH_import_loop': ['Main.hs', 'ModuleA.hs', 'ModuleA.hs-boot', 'ModuleB.hs', 'ModuleC.hs'],
   'TH_spliceViewPat': ['A.hs', 'Main.hs'],
   'andre_monad': ['Main.hs'],
@@ -176,7 +163,6 @@ extra_src_files = {
   'bug1465': ['B1.hs', 'B2.hs', 'C.hs', 'v1/', 'v2/'],
   'bug1677': ['Bar.hs', 'Foo.hs'],
   'bundle-export': ['BundleExport.hs'],
-  'cabal01': ['A.hs', 'B/', 'MainA.hs', 'Setup.lhs', 'c_src/', 'hello.c', 'test.cabal'],
   'cabal03': ['Setup.lhs', 'p/', 'q/', 'r/'],
   'cabal04': ['Library.hs', 'Setup.lhs', 'TH.hs', 'thtest.cabal'],
   'cabal05': ['Setup.hs', 'p/', 'q/', 'r/', 's/', 't/'],
@@ -260,15 +246,9 @@ extra_src_files = {
   'dynamicToo004': ['Setup.hs', 'pkg1/', 'pkg1dyn/', 'pkg2/', 'prog.hs'],
   'dynamicToo005': ['dynamicToo005.bkp'],
   'dynamic_flags_001': ['A.hs', 'B.hs', 'C.hs'],
-  'dynamic_flags_002A': ['A_First.hs', 'A_Main.hs', 'A_Second.hs'],
-  'dynamic_flags_002B': ['B_First.hs', 'B_Main.hs', 'B_Second.hs'],
-  'dynamic_flags_002C': ['C_Child.hs', 'C_Main.hs'],
-  'dynamic_flags_002D': ['D_Child.hs', 'D_Main.hs'],
-  'dynamic_flags_002Many': ['ManyFirst.hs', 'ManySecond.hs', 'ManyThird.hs'],
   'dynbrk001': ['../QSort.hs'],
   'dynbrk002': ['../QSort.hs'],
   'dynbrk004': ['../mdo.hs'],
-  'dynbrk005': ['TupleN.hs'],
   'encoding004': ['encoded-data/'],
   'enum01': ['enum_processor.bat', 'enum_processor.py'],
   'enum02': ['enum_processor.bat', 'enum_processor.py'],
@@ -289,7 +269,6 @@ extra_src_files = {
   'ghci026': ['../prog002'],
   'ghci038': ['../shell.hs'],
   'ghci058': ['../shell.hs'],
-  'ghci062': ['ghci062/', 'ghci062/Test.hs'],
   'ghcilink001': ['TestLink.hs', 'f.c'],
   'ghcilink002': ['TestLink.hs', 'f.c'],
   'ghcilink004': ['TestLink.hs', 'f.c'],
@@ -306,7 +285,6 @@ extra_src_files = {
   'haddock.compiler': ['../../../../compiler/stage2/haddock.t'],
   'heapprof002': ['heapprof001.hs'],
   'hist001': ['../Test3.hs'],
-  'hpc001': ['../hpcrun.pl'],
   'hpc_draft': ['.hpc/', 'hpc001.hs', 'hpc_sample.tix'],
   'hpc_fork': ['../hpcrun.pl'],
   'hpc_ghc_ghci': ['A.hs', 'B.hs'],
@@ -410,7 +388,6 @@ extra_src_files = {
   'overloadedrecfldsfail11': ['OverloadedRecFldsFail11_A.hs'],
   'overloadedrecfldsfail12': ['OverloadedRecFldsFail12_A.hs'],
   'overloadedrecfldsrun02': ['OverloadedRecFldsRun02_A.hs'],
-  'hasfieldfail01': ['HasFieldFail01_A.hs'],
   'p10': ['D.hs'],
   'p11': ['E.hs'],
   'p13': ['P13_A.hs'],
@@ -516,13 +493,11 @@ extra_src_files = {
   'sanders_array': ['Main.hs'],
   'seward-space-leak': ['Main.lhs'],
   'shared001': ['Shared001.hs'],
-  'sigcabal01': ['Main.hs', 'Setup.hs', 'p/'],
   'simpl020': ['Simpl020_A.hs'],
   'simpl021': ['Simpl021A.hs', 'Simpl021B.hs'],
   'simplCore.oneShot': ['OneShot1.hs', 'OneShot2.hs'],
   'simplCore.prog001': ['Simpl006Help.hs', 'simpl006.hs'],
   'simplCore.prog002': ['Simpl009Help.hs', 'simpl009.hs'],
-  'stack002': ['stack001.hs'],
   'static001': ['Static001.hs'],
   'strict_anns': ['Main.hs'],
   'tc170': ['Tc170_Aux.hs'],

testsuite/tests/cabal/cabal01/all.T

@@ -22,6 +22,7 @@ def ignoreLdOutput(str):
     return re.sub('Creating library file: dist.build.libHStest-1.0-ghc[0-9.]*.dll.a\n', '', str)
 
 test('cabal01',
-     normalise_errmsg_fun(ignoreLdOutput),
+     [extra_files(['A.hs', 'B/', 'MainA.hs', 'Setup.lhs', 'c_src/', 'hello.c', 'test.cabal']),
+      normalise_errmsg_fun(ignoreLdOutput)],
      run_command, 
      ['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])

testsuite/tests/cabal/sigcabal01/all.T

@@ -4,6 +4,6 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('sigcabal01',
-     expect_broken(10622),
+     [extra_files(['Main.hs', 'Setup.hs', 'p/']), expect_broken(10622)],
      run_command,
      ['$MAKE -s --no-print-directory sigcabal01 ' + cleanup])

testsuite/tests/driver/dynamic_flags_002/all.T

 test('dynamic_flags_002A',
-     when(fast(), skip), multimod_compile, ['A_Main', '-v0'])
+     [extra_files(['A_First.hs', 'A_Main.hs', 'A_Second.hs']),
+      when(fast(), skip)], multimod_compile, ['A_Main', '-v0'])
 test('dynamic_flags_002B',
-     when(fast(), skip), multimod_compile, ['B_Main', '-v0'])
+     [extra_files(['B_First.hs', 'B_Main.hs', 'B_Second.hs']),
+      when(fast(), skip)], multimod_compile, ['B_Main', '-v0'])
 test('dynamic_flags_002C',
-     when(fast(), skip), multimod_compile, ['C_Main', '-v0'])
+     [extra_files(['C_Child.hs', 'C_Main.hs']),
+      when(fast(), skip)], multimod_compile, ['C_Main', '-v0'])
 test('dynamic_flags_002D',
-     when(fast(), skip), multimod_compile, ['D_Main', '-v0'])
+     [extra_files(['D_Child.hs', 'D_Main.hs']),
+      when(fast(), skip)], multimod_compile, ['D_Main', '-v0'])
 test('dynamic_flags_002Many',
-     when(fast(), skip), multimod_compile,
+     [extra_files(['ManyFirst.hs', 'ManySecond.hs', 'ManyThird.hs']),
+      when(fast(), skip)], multimod_compile,
      ['ManyFirst ManySecond ManyThird', '-v0'])
 

testsuite/tests/generics/all.T

@@ -19,11 +19,12 @@ test('GenCannotDoRep1_8', normal, compile_fail, [''])
 
 test('GFullyStrict', normal, compile_and_run, [''])
 
-test('T5462Yes1', outputdir('out_T5462Yes1')
+test('T5462Yes1', [extra_files(['GEnum/', 'GEq/', 'GFunctor/']),
+                   outputdir('out_T5462Yes1')]
     , multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor'])
-test('T5462Yes2', outputdir('out_T5462Yes2')
+test('T5462Yes2', [extra_files(['GFunctor/']), outputdir('out_T5462Yes2')]
     , multimod_compile_and_run, ['T5462Yes2', '-iGFunctor'])
-test('T5462No1', outputdir('out_T5462No1')
+test('T5462No1', [extra_files(['GFunctor/']), outputdir('out_T5462No1')]
     , multimod_compile_fail, ['T5462No1', '-iGFunctor'])
 
 test('T5884', [], multimod_compile, ['T5884Other', '-v0'])

testsuite/tests/ghc-e/should_fail/all.T

@@ -18,5 +18,6 @@ test('ghc-e-fail2', req_interp, run_command,
 
 # Don't run on Windows, as executable is written to T9930.exe
 # and no failure is induced.
-test('T9930fail', when(opsys('mingw32'), skip), run_command,
+test('T9930fail', [extra_files(['T9930']), when(opsys('mingw32'), skip)],
+     run_command,
      ['$MAKE --no-print-directory -s T9930fail'])

testsuite/tests/ghci.debugger/scripts/all.T

@@ -71,7 +71,8 @@ test('dynbrk001', normal, ghci_script, ['dynbrk001.script'])
 test('dynbrk002', normal, ghci_script, ['dynbrk002.script'])
 test('dynbrk003', normal, ghci_script, ['dynbrk003.script'])
 test('dynbrk004', normal, ghci_script, ['dynbrk004.script'])
-test('dynbrk005', expect_broken(1530), ghci_script, ['dynbrk005.script'])
+test('dynbrk005', [extra_files(['TupleN.hs']), expect_broken(1530)],
+     ghci_script, ['dynbrk005.script'])
 test('dynbrk007', normal, ghci_script, ['dynbrk007.script'])
 test('dynbrk008', normal, ghci_script, ['dynbrk008.script'])
 test('dynbrk009', normal, ghci_script, ['dynbrk009.script'])

testsuite/tests/ghci/scripts/all.T

@@ -94,7 +94,8 @@ test('ghci056',
 test('ghci057', normal, ghci_script, ['ghci057.script'])
 test('ghci060', normal, ghci_script, ['ghci060.script'])
 test('ghci061', normal, ghci_script, ['ghci061.script'])
-test('ghci062', when(config.have_ext_interp, extra_ways(['ghci-ext'])), 
+test('ghci062', [extra_files(['ghci062/', 'ghci062/Test.hs']),
+                 when(config.have_ext_interp, extra_ways(['ghci-ext']))],
 		ghci_script, ['ghci062.script'])
 
 test('T2452', normal, ghci_script, ['T2452.script'])
@@ -217,8 +218,10 @@ test('T11098', normal, ghci_script, ['T11098.script'])
 test('T8316', expect_broken(8316), ghci_script, ['T8316.script'])
 test('T11252', normal, ghci_script, ['T11252.script'])
 
-test('T10576a', expect_broken(10576), ghci_script, ['T10576a.script'])
-test('T10576b', expect_broken(10576), ghci_script, ['T10576b.script'])
+test('T10576a', [extra_files(['T10576.hs']), expect_broken(10576)],
+     ghci_script, ['T10576a.script'])
+test('T10576b', [extra_files(['T10576.hs']), expect_broken(10576)],
+     ghci_script, ['T10576b.script'])
 test('T11051a', normal, ghci_script, ['T11051a.script'])
 test('T11051b', normal, ghci_script, ['T11051b.script'])
 test('T11266', ignore_stdout, ghci_script, ['T11266.script'])

testsuite/tests/overloadedrecflds/should_fail/all.T

@@ -25,8 +25,7 @@ test('T11167_ambiguous_fixity', [], multimod_compile_fail,
      ['T11167_ambiguous_fixity', ''])
 test('T13132_duplicaterecflds', normal, compile_fail, [''])
 test('NoParent', normal, compile_fail, [''])
-test('hasfieldfail01',
-     extra_clean(['HasFieldFail01_A.hi', 'HasFieldFail01_A.o']),
+test('hasfieldfail01', extra_files(['HasFieldFail01_A.hs']),
      multimod_compile_fail, ['hasfieldfail01', ''])
 test('hasfieldfail02', normal, compile_fail, [''])
 test('hasfieldfail03', normal, compile_fail, [''])

testsuite/tests/rts/all.T

@@ -86,7 +86,9 @@ test('testwsdeque', [unless(in_tree_compiler(), skip),
 test('T3236', [c_src, only_ways(['normal','threaded1']), exit_code(1)], compile_and_run, [''])
 
 test('stack001', extra_run_opts('+RTS -K32m -RTS'), compile_and_run, [''])
-test('stack002', extra_run_opts('+RTS -K32m -k4m -RTS'), compile_and_run, [''])
+test('stack002', [extra_files(['stack001.hs']),
+                  extra_run_opts('+RTS -K32m -k4m -RTS')],
+     compile_and_run, [''])
 
 # run this test with very small stack chunks to exercise the stack
 # overflow/underflow machinery.
@@ -178,13 +180,17 @@ def checkDynAsm(actual_file, normaliser):
 # These should have extra_clean() arguments, but I need
 # to somehow extract out the name of DLLs to do that
 
-test('T5435_v_asm', when(arch('powerpc64') or arch('powerpc64le'),
-     expect_broken(11259)),
+test('T5435_v_asm', [extra_files(['T5435.hs', 'T5435_asm.c']),
+                     when(arch('powerpc64') or arch('powerpc64le'),
+                          expect_broken(11259))],
      run_command, ['$MAKE -s --no-print-directory T5435_v_asm'])
-test('T5435_v_gcc', when(arch('powerpc64') or arch('powerpc64le'),
-     expect_broken(11259)),
+test('T5435_v_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']),
+                     when(arch('powerpc64') or arch('powerpc64le'),
+                          expect_broken(11259))],
      run_command, ['$MAKE -s --no-print-directory T5435_v_gcc'])
-test('T5435_dyn_asm', check_stdout(checkDynAsm), run_command, ['$MAKE -s --no-print-directory T5435_dyn_asm'])
+test('T5435_dyn_asm', [extra_files(['T5435.hs', 'T5435_asm.c']),
+                       check_stdout(checkDynAsm)],
+     run_command, ['$MAKE -s --no-print-directory T5435_dyn_asm'])
 test('T5435_dyn_gcc', normal , run_command, ['$MAKE -s --no-print-directory T5435_dyn_gcc'])
 
 test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, [''])

testsuite/tests/typecheck/T11824/all.T

-test('T11824', expect_broken(11824), compile_and_run, [''])
+test('T11824',
+     [extra_files(['TyCon.hs', 'Type.hs', 'Type.hs-boot', 'Unbound/']),
+      expect_broken(11824)],
+     compile_and_run, [''])