diff options
| -rw-r--r-- | testsuite/Makefile | 6 | ||||
| -rw-r--r-- | testsuite/tests/driver/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/driver/T5584_in/A.hs-boot (renamed from testsuite/tests/driver/T5584/A.hs-boot) | 0 | ||||
| -rw-r--r-- | testsuite/tests/driver/all.T | 5 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/polykinds/all.T | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/testsuite/Makefile b/testsuite/Makefile index 66119c5c3d..aacd927746 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -26,4 +26,8 @@ endif clean distclean maintainer-clean: $(MAKE) -C $(TOP)/timeout $@ - $(RM) -f mk/*.o mk/*.hi mk/ghc-config mk/ghc-config.exe mk/ghcconfig*.mk + $(RM) -f mk/*.o + $(RM) -f mk/*.hi + $(RM) -f mk/ghcconfig*.mk + $(RM) -f mk/ghc-config mk/ghc-config.exe + $(RM) -f driver/*.pyc diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile index f87e89f1fd..382ecf002c 100644 --- a/testsuite/tests/driver/Makefile +++ b/testsuite/tests/driver/Makefile @@ -495,7 +495,7 @@ T706: T5584: $(RM) -rf T5584_out mkdir T5584_out - "$(TEST_HC)" -odir T5584_out -c T5584/A.hs-boot + "$(TEST_HC)" -odir T5584_out -c T5584_in/A.hs-boot .PHONY: T5198 T5198: diff --git a/testsuite/tests/driver/T5584/A.hs-boot b/testsuite/tests/driver/T5584_in/A.hs-boot index 559ff2839c..559ff2839c 100644 --- a/testsuite/tests/driver/T5584/A.hs-boot +++ b/testsuite/tests/driver/T5584_in/A.hs-boot diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index be898f764e..6a0317f27a 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -353,8 +353,9 @@ test('spacesInArgs', compile_and_run, ['']) -test('T5584', normal, run_command, - ['$MAKE -s --no-print-directory T5584']) +test('T5584', + extra_clean(['T5584_in/A.hi-boot', 'T5584_out/T5584/A.o-boot']), + run_command, ['$MAKE -s --no-print-directory T5584']) test('T5198', extra_clean(['T5198dump/T5198.dump-simpl', 'T5198dump']), run_command, ['$MAKE -s --no-print-directory T5198']) diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index a1f770f854..a6cbca98f3 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -77,7 +77,7 @@ test('ghci056', [ pre_cmd('$MAKE -s --no-print-directory ghci056_setup'), extra_run_opts('ghci056_c.o'), - extra_clean('ghci056_c.o') + extra_clean(['ghci056_c.o']) ], ghci_script, ['ghci056.script']) diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T index 24b954b624..9ffc6823f5 100644 --- a/testsuite/tests/polykinds/all.T +++ b/testsuite/tests/polykinds/all.T @@ -64,7 +64,7 @@ test('T7151', normal, compile_fail,['']) test('T7095', normal, compile,['']) test('T7090', normal, compile,['']) test('T7272', - extra_clean(['T7272a.hi', 'T7272a.o']), + extra_clean(['T7272a.hi', 'T7272a.o', 'T7272.hi-boot', 'T7272.o-boot']), multimod_compile, ['T7272.hs', '-v0']) test('T7176', normal, compile,['']) |