[commit: testsuite] master: Fix some more written-but-not-cleaned files (c4af4fa)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c4af4fa4df69a52fe1c9c2cb810ec8a9bc4a9329

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

commit c4af4fa4df69a52fe1c9c2cb810ec8a9bc4a9329
Author: Ian Lynagh <igloo at earth.li>
Date:   Mon Sep 5 18:42:14 2011 +0100

    Fix some more written-but-not-cleaned files

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

 tests/driver/all.T                     |    6 ++++--
 tests/rename/prog006/all.T             |    2 +-
 tests/safeHaskell/check/pkg01/Makefile |    4 ++--
 tests/safeHaskell/check/pkg01/all.T    |    4 +++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/driver/all.T b/tests/driver/all.T
index 936046c..484f06b 100644
--- a/tests/driver/all.T
+++ b/tests/driver/all.T
@@ -314,8 +314,10 @@ test('2464', normal, compile, [''])
 test('3674', ignore_output, run_command, 
              ['$MAKE -s --no-print-directory 3674'])
 
-test('rtsopts001', normal, run_command,
-                ['$MAKE -s --no-print-directory rtsopts001'])
+test('rtsopts001',
+     extra_clean(['rtsOpts.hi', 'rtsOpts.o', 'rtsOpts', 'rtsOpts.exe']),
+     run_command,
+     ['$MAKE -s --no-print-directory rtsopts001'])
 test('rtsopts002', normal, run_command,
                 ['$MAKE -s --no-print-directory rtsopts002'])
 
diff --git a/tests/rename/prog006/all.T b/tests/rename/prog006/all.T
index 4126e6c..8ff248f 100644
--- a/tests/rename/prog006/all.T
+++ b/tests/rename/prog006/all.T
@@ -2,6 +2,6 @@ test('rn.prog006',
      extra_clean(['A.hi', 'A.o', 'B/C.hi', 'B/C.o',
                   'Main.hi', 'Main.o', 'pkg.conf',
                   'pwd', 'pwd.exe', 'pwd.exe.manifest',
-                  'pwd.hi', 'pwd.o']),
+                  'pwd.hi', 'pwd.o', 'local.package.conf']),
      run_command,
      ['$MAKE -s --no-print-directory rn.prog006'])
diff --git a/tests/safeHaskell/check/pkg01/Makefile b/tests/safeHaskell/check/pkg01/Makefile
index 7c18381..740143f 100644
--- a/tests/safeHaskell/check/pkg01/Makefile
+++ b/tests/safeHaskell/check/pkg01/Makefile
@@ -2,7 +2,7 @@ TOP=../../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
-clean:
+cleanSafePkg01:
 	rm -rf setup a.out
 	rm -rf dist
 	find . -name "*.o" | xargs rm -f
@@ -21,7 +21,7 @@ PKGCONF = local.db
 LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f '$(PKGCONF)'
 
 safePkg01:
-	'$(MAKE)' clean
+	'$(MAKE)' cleanSafePkg01
 	'$(TEST_HC)' --make -o setup Setup.hs -v0
 
 	'$(GHC_PKG)' init local.db
diff --git a/tests/safeHaskell/check/pkg01/all.T b/tests/safeHaskell/check/pkg01/all.T
index def8d88..98dbebd 100644
--- a/tests/safeHaskell/check/pkg01/all.T
+++ b/tests/safeHaskell/check/pkg01/all.T
@@ -10,7 +10,9 @@ else:
     prof = ''
 
 test('safePkg01',
-     [normal, alone],
+     [# TODO: The other tests in here depend on this one not being cleaned
+      # clean_cmd('$MAKE -s --no-print-directory cleanSafePkg01'),
+      alone],
      run_command, 
      ['$MAKE -s --no-print-directory safePkg01 PROF=' + prof])