From 719be39a38d08bc5c9f2e5ff4ad718eec6e93757 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 8 Sep 2006 21:51:02 +0000 Subject: [PATCH] More cleaning tidyups --- testsuite/tests/ghc-regress/cabal/all.T | 2 ++ .../tests/ghc-regress/ccall/should_run/all.T | 1 + .../ghc-regress/concurrent/should_run/all.T | 1 + testsuite/tests/ghc-regress/gadt/all.T | 2 +- .../tests/ghc-regress/ghci/prog003/prog003.T | 2 +- testsuite/tests/ghc-regress/lib/IO/all.T | 2 ++ testsuite/tests/ghc-regress/lib/Process/all.T | 2 ++ .../tests/ghc-regress/lib/should_run/all.T | 2 ++ testsuite/tests/ghc-regress/module/all.T | 6 ++++-- .../tests/ghc-regress/rename/prog006/all.T | 1 + testsuite/tests/ghc-regress/th/all.T | 19 +++++++++---------- 11 files changed, 26 insertions(+), 14 deletions(-) diff --git a/testsuite/tests/ghc-regress/cabal/all.T b/testsuite/tests/ghc-regress/cabal/all.T index 71a0b41e41..f2577c27ea 100644 --- a/testsuite/tests/ghc-regress/cabal/all.T +++ b/testsuite/tests/ghc-regress/cabal/all.T @@ -5,7 +5,9 @@ clean(['local.package.conf', 'local.package.conf.old']) test('ghcpkg02', skip_if_fast, run_command_ignore_output, ['$MAKE ghcpkg02']) clean(['package.conf.copy', 'package.conf.copy.old']) test('ghcpkg03', normal, run_command_ignore_output, ['$MAKE ghcpkg03']) +clean(['local.package.conf', 'local.package.conf.old']) test('ghcpkg04', normal, run_command, ['$MAKE --no-print-directory ghcpkg04']) +clean(['local.package.conf', 'local.package.conf.old']) # Test that we *can* compile a module that also belongs to a package # (this was disallowed in GHC 6.4 and earlier) diff --git a/testsuite/tests/ghc-regress/ccall/should_run/all.T b/testsuite/tests/ghc-regress/ccall/should_run/all.T index 6edf117b71..2da6c7cdec 100644 --- a/testsuite/tests/ghc-regress/ccall/should_run/all.T +++ b/testsuite/tests/ghc-regress/ccall/should_run/all.T @@ -88,6 +88,7 @@ test('ffi014', only_ways(['threaded']), compile_and_run, ['ffi014_cbits.c']) # GHCi can't handle the separate C file (ToDo: fix this somehow) test('ffi015', omit_ways(['ghci']), compile_and_run, ['ffi015_cbits.c']) +clean(['ffi015_cbits.o']) # GHCi can't handle foreign import "&" test('ffi016', omit_ways(['ghci']), compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/all.T b/testsuite/tests/ghc-regress/concurrent/should_run/all.T index 25db0ecd50..bbb3e40399 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/all.T +++ b/testsuite/tests/ghc-regress/concurrent/should_run/all.T @@ -143,4 +143,5 @@ test('conc058', compose(only_compiler_types(['ghc']), config058), test('conc059', compose(only_compiler_types(['ghc']), only_ways(['threaded1','threaded2'])), compile_and_run, ['conc059_c.c']) +clean(['conc059_c.o']) diff --git a/testsuite/tests/ghc-regress/gadt/all.T b/testsuite/tests/ghc-regress/gadt/all.T index de436b6ab5..c4673af655 100644 --- a/testsuite/tests/ghc-regress/gadt/all.T +++ b/testsuite/tests/ghc-regress/gadt/all.T @@ -19,8 +19,8 @@ test('gadt14', normal, compile, ['']) test('gadt15', normal, compile, ['']) test('gadt16', normal, compile, ['']) -clean(['Gadt17_help.hi', 'Gadt17_help.o']) test('gadt17', normal, run_command_ignore_output, ['$MAKE gadt17']) +clean(['Gadt17_help.hi', 'Gadt17_help.o']) test('red-black', normal, compile, ['']) test('type-rep', skip_if_fast, compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/ghci/prog003/prog003.T b/testsuite/tests/ghc-regress/ghci/prog003/prog003.T index f87ebb689b..b4bfc2d2a1 100644 --- a/testsuite/tests/ghc-regress/ghci/prog003/prog003.T +++ b/testsuite/tests/ghc-regress/ghci/prog003/prog003.T @@ -1,3 +1,3 @@ test('prog003', normal, ghci_script, ['prog003.script']) -clean(['D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', 'A.hi', 'A.o', 'a.out']) +clean(['D.hi', 'C.hi', 'C.o', 'B.hi', 'B.o', 'A', 'A.hi', 'A.o', 'a.out']) diff --git a/testsuite/tests/ghc-regress/lib/IO/all.T b/testsuite/tests/ghc-regress/lib/IO/all.T index 9cce6e3520..3003c03027 100644 --- a/testsuite/tests/ghc-regress/lib/IO/all.T +++ b/testsuite/tests/ghc-regress/lib/IO/all.T @@ -83,3 +83,5 @@ test('hGetBuf001', compose(only_compiler_types(['ghc']), expect_fail_if_windows)), compile_and_run, ['-package unix']) test('hDuplicateTo001', normal, compile_and_run, ['']) +clean(['tmp']) + diff --git a/testsuite/tests/ghc-regress/lib/Process/all.T b/testsuite/tests/ghc-regress/lib/Process/all.T index 05b352f7b2..0578c3a089 100644 --- a/testsuite/tests/ghc-regress/lib/Process/all.T +++ b/testsuite/tests/ghc-regress/lib/Process/all.T @@ -1,3 +1,5 @@ test('process001', normal, compile_and_run, ['']) +clean(['output']) test('process002', normal, compile_and_run, ['']) +clean(['output']) test('process003', omit_ways(['ghci']), compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/lib/should_run/all.T b/testsuite/tests/ghc-regress/lib/should_run/all.T index f04bc6f741..f4bccd37cf 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/all.T +++ b/testsuite/tests/ghc-regress/lib/should_run/all.T @@ -25,9 +25,11 @@ test('list003', skip_if_fast, compile_and_run, ['']) test('memo001', compose(skip_if_fast,extra_run_opts('+RTS -A10k -RTS')), \ multimod_compile_and_run, ['memo001','']) +clean(['Memo.hi', 'Memo.o']) test('memo002', compose(skip_if_fast,extra_run_opts('20')), \ multimod_compile_and_run, ['memo002','']) +clean(['Memo.hi', 'Memo.o']) test('packedstring001', normal, compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/module/all.T b/testsuite/tests/ghc-regress/module/all.T index 6b1eef8bc1..7b1354a2da 100644 --- a/testsuite/tests/ghc-regress/module/all.T +++ b/testsuite/tests/ghc-regress/module/all.T @@ -204,10 +204,12 @@ test('mod154', expect_fail_if_compiler_type('hugs'), compile, ['']) test('mod155', normal, compile_fail, ['']) test('mod156', normal, compile, ['']) test('mod157', normal, multimod_compile, ['mod157', '-v0']) -clean(['Mod157_A.hi', 'Mod157_A.o', 'Mod157_B.hi', 'Mod157_B.o', 'Mod157_C.hi', 'Mod157_C.o']) +clean(['Mod157_A.hi', 'Mod157_A.o', 'Mod157_B.hi', 'Mod157_B.o', + 'Mod157_C.hi', 'Mod157_C.o', 'Mod157_D.hi', 'Mod157_D.o']) test('mod158', normal, compile_fail, ['']) test('mod159', normal, multimod_compile, ['mod159', '-v0']) -clean(['Mod159_A.hi', 'Mod159_A.o', 'Mod159_B.hi', 'Mod159_B.o', 'Mod159_C.hi', 'Mod159_C.o']) +clean(['Mod159_A.hi', 'Mod159_A.o', 'Mod159_B.hi', 'Mod159_B.o', + 'Mod159_C.hi', 'Mod159_C.o', 'Mod159_D.hi', 'Mod159_D.o']) test('mod160', normal, compile_fail, ['']) test('mod161', normal, compile_fail, ['']) test('mod162', normal, multimod_compile, ['mod162', '-v0']) diff --git a/testsuite/tests/ghc-regress/rename/prog006/all.T b/testsuite/tests/ghc-regress/rename/prog006/all.T index 746f885ae3..b70cde3f2b 100644 --- a/testsuite/tests/ghc-regress/rename/prog006/all.T +++ b/testsuite/tests/ghc-regress/rename/prog006/all.T @@ -1 +1,2 @@ test('rn.prog006', normal, run_command, ['$MAKE -s --no-print-directory rn.prog006']) +clean(['A.hi', 'A.o', 'Main.hi', 'Main.o', 'pkg.conf', 'B/C.hi', 'B/C.o']) diff --git a/testsuite/tests/ghc-regress/th/all.T b/testsuite/tests/ghc-regress/th/all.T index 0b69d2947f..de86275111 100644 --- a/testsuite/tests/ghc-regress/th/all.T +++ b/testsuite/tests/ghc-regress/th/all.T @@ -19,7 +19,14 @@ test('TH_repGuardOutput', normal, compile_and_run, ['']) test('TH_repPatSig', normal, compile_fail, ['']) test('TH_spliceE5', normal, multimod_compile_and_run, ['TH_spliceE5', '-v0']) -clean(['TH_spliceE5_Lib.hi', 'TH_spliceE5_Lib.o']) +# Testing profiling with TH is a bit tricky; we've already disabled +# the prof way above, and also we want to add options specifically for +# profiling (-osuf p_o) because this is necessary when mixing +# profiling w/ TH. Furthermore we must have built the program the +# normal way first, so this is a bit of a hack. +test('TH_spliceE5_prof', normal, multimod_compile_and_run, ['TH_spliceE5', '-v0 -prof -auto-all -osuf p_o']) +clean(['TH_spliceE5_Lib.p_o', 'TH_spliceE5_Lib.hi', 'TH_spliceE5_Lib.o', + 'TH_spliceE5.hi', 'TH_spliceE5.p_o']) test('TH_spliceD1', normal, multimod_compile_fail, ['TH_spliceD1', '-v0']) clean(['TH_spliceD1_Lib.hi', 'TH_spliceD1_Lib.o']) @@ -27,15 +34,6 @@ clean(['TH_spliceD1_Lib.hi', 'TH_spliceD1_Lib.o']) test('TH_spliceD2', normal, multimod_compile, ['TH_spliceD2', '-v0']) clean(['TH_spliceD2_Lib.hi', 'TH_spliceD2_Lib.o']) - -# Testing profiling with TH is a bit tricky; we've already disabled -# the prof way above, and also we want to add options specifically for -# profiling (-osof p_o) because this is necessary when mixing -# profiling w/ TH. Furthermore we must have built the program the -# normal way first, so this is a bit of a hack. -test('TH_spliceE5_prof', normal, multimod_compile_and_run, ['TH_spliceE5', '-v0 -prof -auto-all -osuf p_o']) -clean(['TH_spliceE5_Lib.hi', 'TH_spliceE5_Lib.o']) - test('TH_reifyDecl1', normal, compile, ['']) test('TH_reifyType1', normal, compile, ['']) @@ -60,6 +58,7 @@ test('TH_bracket3', normal, compile, ['']) test('TH_class1', normal, compile, ['']) test('TH_tuple1', normal, compile, ['']) test('TH_genEx', normal, multimod_compile, ['TH_genEx', '-v0']) +clean(['TH_genExLib.hi', 'TH_genExLib.o']) test('TH_where', normal, compile_and_run, ['']) -- GitLab