[commit: ghc] master: Attempt to improve cleaning (c3394e0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c3394e0d2cce4bbaa034dc77473add151781ef93/ghc

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

commit c3394e0d2cce4bbaa034dc77473add151781ef93
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 23 15:45:09 2014 +0000

    Attempt to improve cleaning
    
    I found several tests that failed when the interface file format changed,
    due to leftover .hi file droppings.
    
    I'm not sure I've done this right, but it should be a bit better


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

c3394e0d2cce4bbaa034dc77473add151781ef93
 testsuite/tests/deriving/should_run/all.T | 2 +-
 testsuite/tests/driver/Makefile           | 1 +
 testsuite/tests/generics/all.T            | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/testsuite/tests/deriving/should_run/all.T b/testsuite/tests/deriving/should_run/all.T
index 58b4903..13858a8 100644
--- a/testsuite/tests/deriving/should_run/all.T
+++ b/testsuite/tests/deriving/should_run/all.T
@@ -37,4 +37,4 @@ test('T5712', normal, compile_and_run, [''])
 test('T7931', normal, compile_and_run, [''])
 test('T8280', normal, compile_and_run, [''])
 test('T9576', exit_code(1), compile_and_run, [''])
-test('T9830', normal, multimod_compile_and_run, ['T9830','-v0'])
+test('T9830', extra_clean(['T9830a.hi', 'T9830a.o']), multimod_compile_and_run, ['T9830','-v0'])
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile
index 4670958..11724a5 100644
--- a/testsuite/tests/driver/Makefile
+++ b/testsuite/tests/driver/Makefile
@@ -571,6 +571,7 @@ T703:
 
 .PHONY: T2182
 T2182:
+	$(RM) T2182_A.hi T2182.hi
 	! "$(TEST_HC)" $(TEST_HC_OPTS) --make T2182_A.hs T2182.hs -v0
 	! "$(TEST_HC)" $(TEST_HC_OPTS) --make T2182.hs T2182_A.hs -v0
 
diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T
index d959d0c..b5050e4 100644
--- a/testsuite/tests/generics/all.T
+++ b/testsuite/tests/generics/all.T
@@ -19,9 +19,12 @@ test('GenCannotDoRep1_6', normal, compile_fail, [''])
 test('GenCannotDoRep1_7', normal, compile_fail, [''])
 test('GenCannotDoRep1_8', normal, compile_fail, [''])
 
-test('T5462Yes1', normal, multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor -outputdir=out_T5462Yes1'])
-test('T5462Yes2', normal, multimod_compile_and_run, ['T5462Yes2', '-iGFunctor -outputdir=out_T5462Yes2'])
-test('T5462No1', normal, multimod_compile_fail, ['T5462No1', '-iGFunctor -outputdir=T5462No1'])
+test('T5462Yes1', extra_clean(['T5462Yes1/GFunctor.hi'])
+    , multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor -outputdir=out_T5462Yes1'])
+test('T5462Yes2', extra_clean(['T5462Yes2/GFunctor.hi'])
+    , multimod_compile_and_run, ['T5462Yes2', '-iGFunctor -outputdir=out_T5462Yes2'])
+test('T5462No1', extra_clean(['T5462No1/GFunctor.hi'])
+     , multimod_compile_fail, ['T5462No1', '-iGFunctor -outputdir=T5462No1'])
 
 test('T5884',      normal, compile, [''])
 test('GenNewtype', normal, compile_and_run, [''])