[commit: testsuite] master: Fix some testsuite cleaning; part of #7941 (8ae14cc)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

https://github.com/ghc/testsuite/commit/8ae14cc2fbc77a0bd4508801ef7df51170f3558f

>---------------------------------------------------------------

commit 8ae14cc2fbc77a0bd4508801ef7df51170f3558f
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Jun 14 20:03:34 2013 +0100

    Fix some testsuite cleaning; part of #7941

>---------------------------------------------------------------

 Makefile                                   |    6 +++++-
 tests/driver/Makefile                      |    2 +-
 tests/driver/{T5584 => T5584_in}/A.hs-boot |    0 
 tests/driver/all.T                         |    5 +++--
 tests/ghci/scripts/all.T                   |    2 +-
 tests/polykinds/all.T                      |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 66119c5..aacd927 100644
--- a/Makefile
+++ b/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/tests/driver/Makefile b/tests/driver/Makefile
index f87e89f..382ecf0 100644
--- a/tests/driver/Makefile
+++ b/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/tests/driver/T5584/A.hs-boot b/tests/driver/T5584_in/A.hs-boot
similarity index 100%
rename from tests/driver/T5584/A.hs-boot
rename to tests/driver/T5584_in/A.hs-boot
diff --git a/tests/driver/all.T b/tests/driver/all.T
index be898f7..6a0317f 100644
--- a/tests/driver/all.T
+++ b/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/tests/ghci/scripts/all.T b/tests/ghci/scripts/all.T
index a1f770f..a6cbca9 100755
--- a/tests/ghci/scripts/all.T
+++ b/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/tests/polykinds/all.T b/tests/polykinds/all.T
index 24b954b..9ffc682 100644
--- a/tests/polykinds/all.T
+++ b/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,[''])