Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e9c719ab7489ab57742d433656f12a7954f75e12 >--------------------------------------------------------------- commit e9c719ab7489ab57742d433656f12a7954f75e12 Author: Ian Lynagh <[email protected]> Date: Tue Oct 11 21:26:35 2011 +0100 Improve test T5373 >--------------------------------------------------------------- tests/dynlibs/Makefile | 8 +++++--- tests/dynlibs/T5373.stdout | 1 + tests/dynlibs/{T5373A.hs => T5373D.hs} | 0 tests/dynlibs/all.T | 10 ++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/dynlibs/Makefile b/tests/dynlibs/Makefile index d5561ae..9f6469b 100644 --- a/tests/dynlibs/Makefile +++ b/tests/dynlibs/Makefile @@ -35,7 +35,9 @@ T5373: '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373A '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373B -rtsopts '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373C -rtsopts=some - -./T5373A +RTS -\? 2>&1 | grep "Most RTS options are disabled" - -./T5373B +RTS -\? 2>&1 | grep "Most RTS options are disabled" - -./T5373C +RTS -\? 2>&1 | grep "Most RTS options are disabled" + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373D -rtsopts=none + -./T5373A +RTS -\? 2>&1 | grep disabled + -./T5373B +RTS -\? 2>&1 | grep disabled + -./T5373C +RTS -\? 2>&1 | grep disabled + -./T5373D +RTS -\? 2>&1 | grep disabled diff --git a/tests/dynlibs/T5373.stdout b/tests/dynlibs/T5373.stdout index f06de0a..1031fde 100644 --- a/tests/dynlibs/T5373.stdout +++ b/tests/dynlibs/T5373.stdout @@ -1,2 +1,3 @@ T5373A: Most RTS options are disabled. Link with -rtsopts to enable them. T5373C: Most RTS options are disabled. Link with -rtsopts to enable them. +T5373D: RTS options are disabled. Link with -rtsopts to enable them. diff --git a/tests/dynlibs/T5373A.hs b/tests/dynlibs/T5373D.hs similarity index 100% copy from tests/dynlibs/T5373A.hs copy to tests/dynlibs/T5373D.hs diff --git a/tests/dynlibs/all.T b/tests/dynlibs/all.T index 3a2cf82..df0113b 100644 --- a/tests/dynlibs/all.T +++ b/tests/dynlibs/all.T @@ -19,10 +19,12 @@ test('T4464', ['$MAKE --no-print-directory -s T4464']) test('T5373', - extra_clean(['T5373A.hi', 'T5373B.hi', 'T5373C.hi', - 'T5373A.o', 'T5373B.o', 'T5373C.o', - 'T5373A', 'T5373B', 'T5373C', - 'T5373A.exe', 'T5373B.exe', 'T5373C.exe']), + [extra_clean(['T5373A.hi', 'T5373B.hi', 'T5373C.hi', 'T5373D.hi', + 'T5373A.o', 'T5373B.o', 'T5373C.o', 'T5373D.o', + 'T5373A', 'T5373B', 'T5373C', 'T5373D', + 'T5373A.exe', 'T5373B.exe', 'T5373C.exe', 'T5373D.exe']), + if_os('mingw32', expect_broken(5373)), + if_os('darwin', expect_broken(5373))], run_command, ['$MAKE --no-print-directory -s T5373']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
