[commit: filepath] master: Test cleaning fixes (8d34f78)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/filepath

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8d34f787e06bf3a1802992246785939901dec8aa

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

commit 8d34f787e06bf3a1802992246785939901dec8aa
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Jun 13 23:15:19 2013 +0100

    Test cleaning fixes

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

 tests/Makefile |    9 +++++----
 tests/all.T    |    9 ++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 284d0a5..7bdd040 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,11 +8,12 @@ include $(TOP)/mk/test.mk
 
 .PHONY: ghc-filepath-tests
 ghc-filepath-tests:
-	$(RM) -f GenTests.hi GenTests.o GenTests
+	$(RM) -f GenTests.hi GenTests.o GenTests GenTests.exe
 	$(RM) -f AutoTest.hi AutoTest.o
-	$(RM) -f FilePath_Test.hi FilePath_Test.o FilePath_Test
-	'$(TEST_HC)' -v0 --make GenTests
+	$(RM) -f FilePath_Test.hs
+	$(RM) -f FilePath_Test.hi FilePath_Test.o FilePath_Test FilePath_Test.exe
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make GenTests
 	./GenTests
-	'$(TEST_HC)' -v0 --make FilePath_Test
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make FilePath_Test
 	./FilePath_Test
 
diff --git a/tests/all.T b/tests/all.T
index 29487f9..55798de 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,3 +1,10 @@
 
-test('filepath', reqlib('QuickCheck'), run_command, ['$MAKE -s --no-print-directory ghc-filepath-tests'])
+test('filepath',
+     [reqlib('QuickCheck'),
+      extra_clean(['FilePath_Test.hs',
+                   'FilePath_Test.hi', 'FilePath_Test.o',
+                   'FilePath_Test',    'FilePath_Test.exe',
+                   'GenTests.hi',      'GenTests.o',
+                   'GenTests',         'GenTests.exe'])],
+     run_command, ['$MAKE -s --no-print-directory ghc-filepath-tests'])