Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : no-pred-ty
http://hackage.haskell.org/trac/ghc/changeset/446bdf9b82e5f364c88e222fc4b9ed9392162469 >--------------------------------------------------------------- commit 446bdf9b82e5f364c88e222fc4b9ed9392162469 Author: Max Bolingbroke <[email protected]> Date: Tue Aug 23 19:09:19 2011 +0100 Clean more stuff in the safeHaskell tests >--------------------------------------------------------------- tests/safeHaskell/safeLanguage/all.T | 12 ++++++------ tests/safeHaskell/unsafeLibs/all.T | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/safeHaskell/safeLanguage/all.T b/tests/safeHaskell/safeLanguage/all.T index 1e3fb31..d69fa57 100644 --- a/tests/safeHaskell/safeLanguage/all.T +++ b/tests/safeHaskell/safeLanguage/all.T @@ -9,14 +9,14 @@ test('SafeLang02', normal, compile, ['-trust base']) test('SafeLang03', normal, compile, ['-trust base']) test('SafeLang04', normal, compile_and_run, ['']) test('SafeLang05', normal, compile_and_run, ['-trust base']) -test('SafeLang06', normal, compile_and_run, ['']) +test('SafeLang06', extra_clean(['SafeLang06_A.hi', 'SafeLang06_A.o']), compile_and_run, ['']) test('SafeLang07', normal, compile_fail, ['']) test('SafeLang08', normal, compile_fail, ['']) -test('SafeLang09', exit_code(1), compile_and_run, ['']) -test('SafeLang10', normal, multimod_compile_fail, ['SafeLang10', '-trust base']) -test('SafeLang11', req_interp, multimod_compile_and_run, ['SafeLang11', '-trust base']) +test('SafeLang09', compose(exit_code(1), extra_clean(['SafeLang09_A.hi', 'SafeLang09_A.o'])), compile_and_run, ['']) +test('SafeLang10', extra_clean(['SafeLang10_A.hi', 'SafeLang10_A.o']), multimod_compile_fail, ['SafeLang10', '-trust base']) +test('SafeLang11', compose(req_interp, extra_clean(['SafeLang11_A.hi', 'SafeLang11_A.o', 'SafeLang11_B.hi', 'SafeLang11_B.o'])), multimod_compile_and_run, ['SafeLang11', '-trust base']) test('SafeLang12', normal, multimod_compile_fail, ['SafeLang12', '-trust base']) -test('SafeLang13', normal, multimod_compile_and_run, ['SafeLang13', '-trust base']) +test('SafeLang13', extra_clean(['SafeLang13_A.hi', 'SafeLang13_A.o']), multimod_compile_and_run, ['SafeLang13', '-trust base']) test('SafeLang14', normal, multimod_compile_fail, ['SafeLang14', '-trust base -XSafe']) -test('SafeLang15', exit_code(1), multimod_compile_and_run, ['SafeLang15', '-trust base -XSafe']) +test('SafeLang15', compose(exit_code(1), extra_clean(['SafeLang15_A.hi', 'SafeLang15_A.o'])), multimod_compile_and_run, ['SafeLang15', '-trust base -XSafe']) diff --git a/tests/safeHaskell/unsafeLibs/all.T b/tests/safeHaskell/unsafeLibs/all.T index 839da38..052a68f 100644 --- a/tests/safeHaskell/unsafeLibs/all.T +++ b/tests/safeHaskell/unsafeLibs/all.T @@ -16,6 +16,6 @@ test('Dep09', normal, compile, ['']) test('Dep10', normal, compile, ['']) test('BadImport01', normal, compile_fail, ['']) -test('BadImport02', normal, multimod_compile_and_run, ['BadImport02', '']) +test('BadImport02', extra_clean(['BadImport02_A.hi', 'BadImport02_A.o']), multimod_compile_and_run, ['BadImport02', '']) test('BadImport03', normal, multimod_compile_fail, ['BadImport03', '']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
