Fix some more written-but-not-cleaned files
authorIan Lynagh <igloo@earth.li>
Tue, 6 Sep 2011 15:48:02 +0000 (16:48 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 6 Sep 2011 15:48:02 +0000 (16:48 +0100)
15 files changed:
testsuite/tests/driver/all.T
testsuite/tests/gadt/all.T
testsuite/tests/ghci/prog005/A1.hs [moved from testsuite/tests/ghci/prog005/A.hs with 100% similarity]
testsuite/tests/ghci/prog005/prog005.T
testsuite/tests/ghci/prog005/prog005.script
testsuite/tests/ghci/should_run/Makefile
testsuite/tests/perf/should_run/T3736.hs
testsuite/tests/perf/should_run/all.T
testsuite/tests/rename/should_compile/all.T
testsuite/tests/rts/Makefile
testsuite/tests/rts/T4059.hs [moved from testsuite/tests/rts/4059.hs with 100% similarity]
testsuite/tests/rts/T4059_c.c [moved from testsuite/tests/rts/4059_c.c with 100% similarity]
testsuite/tests/rts/all.T
testsuite/tests/simplCore/should_compile/all.T
testsuite/tests/typecheck/should_fail/all.T

index b2a9c11..73fbf2f 100644 (file)
@@ -321,8 +321,11 @@ test('5313', extra_run_opts('\'' + libdir + '\''), compile_and_run, ['-package g
 # extra_run_opts: be careful about quoting on Windows!
 
 test('2464', normal, compile, [''])
-test('3674', ignore_output, run_command, 
-             ['$MAKE -s --no-print-directory 3674'])
+test('3674',
+     [ignore_output,
+      extra_clean(['3674_pre.hi', '3674_pre.o', '3674_pre', '3674_pre.exe'])],
+     run_command, 
+     ['$MAKE -s --no-print-directory 3674'])
 
 test('rtsopts001',
      extra_clean(['rtsOpts.hi', 'rtsOpts.o', 'rtsOpts', 'rtsOpts.exe']),
@@ -343,4 +346,8 @@ test('T4437', only_ways(['normal']), compile_and_run, ['-package ghc'])
 
 test('werror', normal, compile_fail, [''])
 
-test('T706', req_interp, run_command, ['$MAKE -s --no-print-directory T706'])
+test('T706',
+     [req_interp,
+      extra_clean(['T706.hs'])],
+     run_command,
+     ['$MAKE -s --no-print-directory T706'])
index 6052065..59e4d2e 100644 (file)
@@ -107,4 +107,7 @@ test('gadtSyntaxFail001', if_compiler_lt('ghc', '7.1', expect_fail), compile_fai
 test('gadtSyntaxFail002', if_compiler_lt('ghc', '7.1', expect_fail), compile_fail, [''])
 test('gadtSyntaxFail003', if_compiler_lt('ghc', '7.1', expect_fail), compile_fail, [''])
 test('T3169', normal, compile_fail, [''])
-test('T5424', normal, multimod_compile, ['T5424', '-v0 -O0'])
+test('T5424',
+     extra_clean(['T5424a.hi', 'T5424a.o']),
+     multimod_compile,
+     ['T5424', '-v0 -O0'])
index ca2bfe5..4c44c6b 100644 (file)
@@ -1,2 +1,2 @@
-test('prog005', normal, ghci_script, ['prog005.script'])
+test('prog005', extra_clean(['A.hs']), ghci_script, ['prog005.script'])
 
index d7ca33f..d720edb 100644 (file)
@@ -1,6 +1,7 @@
 :unset +s
 :unset +t
 
+:!cp A1.hs A.hs
 :load B
 
 -- eval something that isn't exported from B
index 3354196..c61de97 100644 (file)
@@ -5,5 +5,5 @@ include $(TOP)/mk/test.mk
 # Test that threadDelay can be interrupted by ^C.
 3171:
        echo "do Control.Concurrent.threadDelay 3000000; putStrLn \"threadDelay was not interrupted\"" | \
-       "$(TEST_HC)" $(TEST_HC_OPTS) -ignore-dot-ghci -v0 --interactive 2>3171.err & \
+       "$(TEST_HC)" $(TEST_HC_OPTS) -ignore-dot-ghci -v0 --interactive & \
        sleep 2; kill -INT $$!; wait
index e812109..3a399ad 100644 (file)
@@ -113,7 +113,7 @@ size = 10000000
 
 mainMonolithic1Composed :: IO ()
 mainMonolithic1Composed =
-   writeFile "speed.f32"
+   writeFile "T3736.speed.f32"
       (fst $ unfoldrN size
           (let (f0,f1,f2) = dl
            in  generator0Freq f0 `mix`
@@ -124,7 +124,7 @@ mainMonolithic1Composed =
 
 mainMonolithic1Generator :: IO ()
 mainMonolithic1Generator =
-   writeFile "speed.f32"
+   writeFile "T3736.speed.f32"
       (runGeneratorMonolithic size
           (let (f0,f1,f2) = dl
                (p0,p1,p2) = fst initPhase2
index 5579a1a..b3c3b6a 100644 (file)
@@ -52,7 +52,10 @@ else:
 
 test('T4321', omit_ways(['ghci']), compile_and_run, ['-O ' + sse2_opts])
 
-test('T3736', normal, run_command, ['$MAKE -s --no-print-directory T3736'])
+test('T3736',
+     extra_clean(['T3736.speed.f32']),
+     run_command,
+     ['$MAKE -s --no-print-directory T3736'])
 test('T3738',
      [extra_clean(['T3738a.hi', 'T3738a.o']),
       stats_num_field('peak_megabytes_allocated', 1,
index 3786a5b..9c97503 100644 (file)
@@ -146,18 +146,17 @@ test('T4003',
 test('T1789', normal, compile, [''])
 test('T1789_2', normal, compile, [''])
 test('T3449',
-     extra_clean(['T3449.hi-boot', 'T3449.hi',
-                  'T3449.o-boot',  'T3449.o']),
+     extra_clean(['T3449.hi-boot', 'T3449A.hi',
+                  'T3449.o-boot',  'T3449A.o']),
      run_command,
      ['$MAKE -s --no-print-directory T3449'])
 test('T4239',
      [expect_broken(4239),
-      extra_clean(['T4239A.hi', 'T4239A.o', 'T4239.hi', 'T4239.o',
-                   'T4239.imports'])],
+      extra_clean(['T4239A.hi', 'T4239A.o', 'T4239.imports'])],
      run_command,
      ['$MAKE -s --no-print-directory T4239'])
 test('T4240',
-     [extra_clean(['T4240A.hi', 'T4240A.o', 'T4240.hi', 'T4240.o',
+     [extra_clean(['T4240A.hi', 'T4240A.o', 'T4240B.hi', 'T4240B.o',
                    'T4240.imports'])],
      run_command,
      ['$MAKE -s --no-print-directory T4240'])
index 920230f..540a474 100644 (file)
@@ -23,9 +23,9 @@ T2615-prep:
 
 .PHONY: T4059
 T4059:
-       $(RM) 4059_c.o 4059.o 4059.hi
-       '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make 4059 4059_c.c
-       ./4059
+       $(RM) T4059_c.o T4059.o T4059.hi
+       '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make T4059 T4059_c.c
+       ./T4059
 
 exec_signals-prep:
        $(CC) -o exec_signals_child exec_signals_child.c
index 06bb374..6940a43 100644 (file)
@@ -83,7 +83,7 @@ test('T2615',
        cmd_prefix('$MAKE T2615-prep && ' +
                   # Add current directory to dlopen search path
                   'LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. '),
-       extra_clean(['libfoo_T2615.so'])],
+       extra_clean(['libfoo_T2615.so', 'libfoo_T2615.o'])],
      compile_and_run,
      ['-package ghc'])
 
@@ -93,7 +93,10 @@ test('traceEvent', [ omit_ways(['dyn'] + prof_ways),
                      extra_run_opts('+RTS -ls -RTS') ], 
                    compile_and_run, ['-eventlog'])
 
-test('T4059', normal, run_command, ['$MAKE -s --no-print-directory T4059'])
+test('T4059',
+     extra_clean(['T4059_c.o']),
+     run_command,
+     ['$MAKE -s --no-print-directory T4059'])
 
 # Test for #4274
 test('exec_signals', [
index d3fa89b..22e7660 100644 (file)
@@ -98,12 +98,12 @@ test('T4345', normal, compile, [''])
 test('T4398', normal, compile, [''])
 
 test('T4903',
-     extra_clean(['T4903a.hi']),
+     extra_clean(['T4903a.hi', 'T4903a.o']),
      run_command,
      ['$MAKE -s --no-print-directory T4903'])
 
 test('T4918',
-     normal,
+     extra_clean(['T4918a.hi', 'T4918a.o']),
      run_command,
      ['$MAKE -s --no-print-directory T4918'])
 
index 283be2f..0788788 100644 (file)
@@ -221,7 +221,7 @@ test('T3950', normal, compile_fail, [''])
 test('T3966', normal, compile_fail, [''])
 test('IPFail', normal, compile_fail, [''])
 
-test('T3468', extra_clean(['T3468.hi-boot']), 
+test('T3468', extra_clean(['T3468.hi-boot', 'T3468.o-boot']), 
      multimod_compile_fail, ['T3468', '-v0'])
 test('T2846b', normal, compile_fail, [''])
 test('FrozenErrorTests', normal, compile_fail, [''])