tests: remove extra_files.py (#12223)

The script I used is included as testsuite/driver/kill_extra_files.py,
though at this point it is for mostly historical interest.

Some of the tests in libraries/hpc relied on extra_files.py, so this
commit includes an update to that submodule.

One test in libraries/process also relies on extra_files.py, but we
cannot update that submodule so easily, so for now we special-case it
in the test driver.

4 files changed, 53 insertions, 27 deletions

diff --git a/testsuite/tests/rts/T10672/all.T b/testsuite/tests/rts/T10672/all.T
index 4e06204b19..c24ded25b4 100644
--- a/testsuite/tests/rts/T10672/all.T
+++ b/testsuite/tests/rts/T10672/all.T
@@ -1,7 +1,9 @@
 test('T10672_x64',
-     [[unless(opsys('mingw32'), skip), unless(arch('x86_64'), skip)]],
+     [extra_files(['Main.hs', 'Printf.hs', 'cxxy.cpp']),
+      [unless(opsys('mingw32'), skip), unless(arch('x86_64'), skip)]],
      run_command, ['$MAKE -s --no-print-directory T10672_x64'])
 
 test('T10672_x86',
-     [[unless(opsys('mingw32'), skip), unless(arch('i386'), skip)]],
+     [extra_files(['Main.hs', 'Printf.hs', 'cxxy.cpp']),
+      [unless(opsys('mingw32'), skip), unless(arch('i386'), skip)]],
      run_command, ['$MAKE -s --no-print-directory T10672_x86'])
diff --git a/testsuite/tests/rts/T11223/all.T b/testsuite/tests/rts/T11223/all.T
index 1088d02b53..0a578c03b5 100644
--- a/testsuite/tests/rts/T11223/all.T
+++ b/testsuite/tests/rts/T11223/all.T
@@ -13,49 +13,58 @@ def normalise_duplicate_errmsg( msg ):
 #--------------------------------------
 
 test('T11223_simple_link',
-     [when(ghc_dynamic(), skip)],
+     [extra_files(['foo.c', 'foo.hs']),
+      when(ghc_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_simple_link'])
 
 test('T11223_simple_link_lib',
-     [when(ghc_dynamic(), skip)],
+     [extra_files(['foo.c', 'foo.hs']),
+      when(ghc_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_simple_link_lib'])
 
 # I'm ignoring the output since for this particular invocation normalise_errmsg
 # isn't being called and I can't figure out why not.
 test('T11223_simple_duplicate',
-     [when(ghc_dynamic(), skip), ignore_stderr, ignore_stdout, exit_code(2), normalise_errmsg_fun(normalise_duplicate_errmsg)],
+     [extra_files(['bar.c', 'foo.c', 'foo.hs']),
+      when(ghc_dynamic(), skip), ignore_stderr, ignore_stdout, exit_code(2), normalise_errmsg_fun(normalise_duplicate_errmsg)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_simple_duplicate'])
 
 test('T11223_simple_duplicate_lib',
-     [when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)],
+     [extra_files(['bar.c', 'foo.c', 'foo.hs']),
+      when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_simple_duplicate_lib'])
 
 test('T11223_simple_unused_duplicate_lib',
-     [when(ghc_dynamic(), skip)],
+     [extra_files(['bar.c', 'foo.c', 'foo.hs']),
+      when(ghc_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_simple_unused_duplicate_lib'])
 
 test('T11223_link_order_a_b_succeed',
-     [when(ghc_dynamic(), skip)],
+     [extra_files(['bar.c', 'foo.c', 'foo2.hs']),
+      when(ghc_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_link_order_a_b_succeed'])
 
 test('T11223_link_order_b_a_succeed',
-     [when(ghc_dynamic(), skip)],
+     [extra_files(['bar.c', 'foo.c', 'foo2.hs']),
+      when(ghc_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_link_order_b_a_succeed'])
 
 test('T11223_link_order_a_b_2_fail',
-     [when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)],
+     [extra_files(['bar.c', 'foo.c', 'foo3.hs']),
+      when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_link_order_a_b_2_fail'])
 
 test('T11223_link_order_b_a_2_succeed',
-     [when(ghc_dynamic(), skip)],
+     [extra_files(['bar.c', 'foo.c', 'foo3.hs']),
+      when(ghc_dynamic(), skip)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_link_order_b_a_2_succeed'])
 
@@ -63,31 +72,37 @@ test('T11223_link_order_b_a_2_succeed',
 # See Note [weak-symbols-support] in Linker.c
 
 test('T11223_weak_only_link_fail',
-     [when(ghc_dynamic(), skip), expect_broken(11817)],
+     [extra_files(['power.c', 'power.hs']),
+      when(ghc_dynamic(), skip), expect_broken(11817)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_weak_only_link_fail'])
 
 test('T11223_weak_only_link_succeed',
-     [when(ghc_dynamic(), skip), expect_broken(11817)],
+     [extra_files(['power3.hs', 'power_slow.c']),
+      when(ghc_dynamic(), skip), expect_broken(11817)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_weak_only_link_succeed'])
 
 test('T11223_weak_both_link_order_a_b_succeed',
-     [when(ghc_dynamic(), skip), expect_broken(11817)],
+     [extra_files(['power.c', 'power3.hs', 'power_slow.c']),
+      when(ghc_dynamic(), skip), expect_broken(11817)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_weak_both_link_order_a_b_succeed'])
 
 test('T11223_weak_both_link_order_b_a_succeed',
-     [when(ghc_dynamic(), skip), expect_broken(11817)],
+     [extra_files(['power.c', 'power3.hs', 'power_slow.c']),
+      when(ghc_dynamic(), skip), expect_broken(11817)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_weak_both_link_order_b_a_succeed'])
 
 test('T11223_weak_single_link_order_a_b_succeed',
-     [when(ghc_dynamic(), skip), expect_broken(11817)],
+     [extra_files(['power.c', 'power3.hs', 'power_slow.c']),
+      when(ghc_dynamic(), skip), expect_broken(11817)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_weak_single_link_order_a_b_succeed'])
 
 test('T11223_weak_single_link_order_b_a_succeed',
-     [when(ghc_dynamic(), skip), expect_broken(11817)],
+     [extra_files(['power.c', 'power3.hs', 'power_slow.c']),
+      when(ghc_dynamic(), skip), expect_broken(11817)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_weak_single_link_order_b_a_succeed'])
diff --git a/testsuite/tests/rts/T5644/all.T b/testsuite/tests/rts/T5644/all.T
index 4b2332bbc6..7dd120d575 100644
--- a/testsuite/tests/rts/T5644/all.T
+++ b/testsuite/tests/rts/T5644/all.T
@@ -1,4 +1,5 @@
-test('T5644', [
+test('T5644', [extra_files(['Conf.hs', 'ManyQueue.hs', 'Util.hs', 'heap-overflow.hs']),
+               
                 only_ways(['optasm','threaded1','threaded2']),
                 extra_run_opts('+RTS -M20m -RTS'),
                 exit_code(251) # RTS exit code for "out of memory"
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 79e1461596..fc7363f6bd 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -78,7 +78,8 @@ test('T2783', [ omit_ways(['ghci']), exit_code(1) ], compile_and_run, [''])
 
 # Test the work-stealing deque implementation.  We run this test in
 # both threaded1 (-threaded -debug) and threaded2 (-threaded) ways.
-test('testwsdeque', [unless(in_tree_compiler(), skip),
+test('testwsdeque', [extra_files(['../../../rts/WSDeque.h']),
+                     unless(in_tree_compiler(), skip),
                     req_smp, # needs atomic 'cas'
                     c_src, only_ways(['threaded1', 'threaded2'])],
                     compile_and_run, [''])
@@ -112,7 +113,8 @@ test('rtsflags002', [ only_ways(['normal']) ], compile_and_run, ['-with-rtsopts=
 
 # Test to see if linker scripts link properly to real ELF files
 test('T2615',
-     [ when(opsys('mingw32'), skip),
+     [extra_files(['libfoo_T2615.c', 'libfoo_script_T2615.so']),
+       when(opsys('mingw32'), skip),
        # OS X doesn't seem to support linker scripts
        when(opsys('darwin'), skip),
        # Solaris' linker does not support GNUish linker scripts
@@ -147,7 +149,8 @@ def config_T5250(name, opts):
     if not (config.arch in ['i386','x86_64']):
         opts.skip = 1;
 
-test('T5250', [ config_T5250,
+test('T5250', [extra_files(['spalign.c']),
+                config_T5250,
                 # stack ptr is not 16-byte aligned on 32-bit Windows
                 when(platform('i386-unknown-mingw32'), expect_fail),
                 when(platform('i386-unknown-linux'),
@@ -191,7 +194,7 @@ test('T5435_v_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']),
 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('T5435_dyn_gcc', extra_files(['T5435.hs', 'T5435_gcc.c']) , run_command, ['$MAKE -s --no-print-directory T5435_dyn_gcc'])
 
 test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, [''])
 
@@ -211,7 +214,8 @@ test('T7160', normal, compile_and_run, [''])
 test('T7040', [omit_ways(['ghci'])], compile_and_run, ['T7040_c.c'])
 
 test('T7040_ghci',
-     [only_ways(['ghci']),
+     [extra_files(['T7040_c.h']),
+      only_ways(['ghci']),
       pre_cmd('$MAKE -s --no-print-directory T7040_ghci_setup')],
      compile_and_run, ['T7040_ghci_c.o'])
 
@@ -240,7 +244,8 @@ test('T7919', [when(fast(), skip), omit_ways(prof_ways)], compile_and_run,
 test('T8035', normal, compile_and_run, [''])
 
 test('linker_unload',
-     [when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))],
+     [extra_files(['LinkerUnload.hs', 'Test.hs']),
+      when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))],
      run_command, ['$MAKE -s --no-print-directory linker_unload'])
 
 test('T8209', [ req_smp, only_ways(threaded_ways), ignore_stdout ],
@@ -288,13 +293,16 @@ test('overflow1', [ exit_code(251) ], compile_and_run, [''])
 test('overflow2', [ exit_code(251) ], compile_and_run, [''])
 test('overflow3', [ exit_code(251) ], compile_and_run, [''])
 
-test('linker_error1', [ignore_stderr], run_command,
+test('linker_error1', [extra_files(['linker_error.c']),
+                       ignore_stderr], run_command,
      ['$MAKE -s --no-print-directory linker_error1'])
 
-test('linker_error2', [ignore_stderr], run_command,
+test('linker_error2', [extra_files(['linker_error.c']),
+                       ignore_stderr], run_command,
      ['$MAKE -s --no-print-directory linker_error2'])
 
-test('linker_error3', [ignore_stderr], run_command,
+test('linker_error3', [extra_files(['linker_error.c']),
+                       ignore_stderr], run_command,
      ['$MAKE -s --no-print-directory linker_error3'])
 
 def grep_stderr(pattern):