Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/7fe9b9facca29d87c8879a832f5e735bc59e7cdb >--------------------------------------------------------------- commit 7fe9b9facca29d87c8879a832f5e735bc59e7cdb Author: Ian Lynagh <[email protected]> Date: Fri Jul 15 13:01:36 2011 +0100 Stop CheckA and CheckB sharing a source file Caused failures when run in parallel >--------------------------------------------------------------- tests/ghc-regress/safeHaskell/check/CheckB.hs | 2 +- tests/ghc-regress/safeHaskell/check/CheckB.stderr | 2 +- .../check/{Check03_A.hs => CheckB_Aux.hs} | 2 +- tests/ghc-regress/safeHaskell/check/all.T | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/ghc-regress/safeHaskell/check/CheckB.hs b/tests/ghc-regress/safeHaskell/check/CheckB.hs index f690aab..7e649a1 100644 --- a/tests/ghc-regress/safeHaskell/check/CheckB.hs +++ b/tests/ghc-regress/safeHaskell/check/CheckB.hs @@ -3,7 +3,7 @@ -- Since Safe we require base package be trusted to compile module CheckB where -import CheckA +import CheckB_Aux mainM :: Int -> Int mainM n = trace "Allowed Leak" $ n * 2 diff --git a/tests/ghc-regress/safeHaskell/check/CheckB.stderr b/tests/ghc-regress/safeHaskell/check/CheckB.stderr index 64acb24..f8321b3 100644 --- a/tests/ghc-regress/safeHaskell/check/CheckB.stderr +++ b/tests/ghc-regress/safeHaskell/check/CheckB.stderr @@ -1,2 +1,2 @@ -[1 of 2] Compiling CheckA ( CheckA.hs, CheckA.o ) +[1 of 2] Compiling CheckB_Aux ( CheckB_Aux.hs, CheckB_Aux.o ) [2 of 2] Compiling CheckB ( CheckB.hs, CheckB.o ) diff --git a/tests/ghc-regress/safeHaskell/check/Check03_A.hs b/tests/ghc-regress/safeHaskell/check/CheckB_Aux.hs similarity index 93% copy from tests/ghc-regress/safeHaskell/check/Check03_A.hs copy to tests/ghc-regress/safeHaskell/check/CheckB_Aux.hs index e7b8d75..c04d510 100644 --- a/tests/ghc-regress/safeHaskell/check/Check03_A.hs +++ b/tests/ghc-regress/safeHaskell/check/CheckB_Aux.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Trustworthy #-} -module Check03_A ( +module CheckB_Aux ( trace ) where diff --git a/tests/ghc-regress/safeHaskell/check/all.T b/tests/ghc-regress/safeHaskell/check/all.T index 2c705b1..2e769ba 100644 --- a/tests/ghc-regress/safeHaskell/check/all.T +++ b/tests/ghc-regress/safeHaskell/check/all.T @@ -5,7 +5,9 @@ def f( opts ): setTestOpts(f) test('CheckA', normal, compile, ['']) -test('CheckB', normal, multimod_compile, ['CheckB', '-trust base']) +test('CheckB', + extra_clean(['CheckB_Aux.hi', 'CheckB_Aux.o']), + multimod_compile, ['CheckB', '-trust base']) # fail as we don't trust base when compiling Check01 test('Check01', normal, multi_compile_fail, ['Check01', [ _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
