[commit: ghc] master: Testsuite: do not add -debug explicitly in .T file (0eb0378)

git at git.haskell.org git at git.haskell.org
Tue Jun 28 12:21:56 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0eb037814b39dc66a2c5549d2310e9853bc8292a/ghc

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

commit 0eb037814b39dc66a2c5549d2310e9853bc8292a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Jun 28 00:21:58 2016 +0200

    Testsuite: do not add -debug explicitly in .T file
    
    This prevents `cannot find -lHSrts_debug_p` when running `make
    TEST=T9078 WAY=profasm` (#9078).


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

0eb037814b39dc66a2c5549d2310e9853bc8292a
 testsuite/tests/rts/T9078.stderr | 2 --
 testsuite/tests/rts/all.T        | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/rts/T9078.stderr b/testsuite/tests/rts/T9078.stderr
deleted file mode 100644
index 901a1ca..0000000
--- a/testsuite/tests/rts/T9078.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-cap 0: initialised
-cap 0: shutting down
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index bfdf318..086f479 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -259,9 +259,9 @@ test('T8124', [ only_ways(threaded_ways), omit_ways(['ghci']),
 # The ghci way gets confused by the RTS options
 test('T9045', [ omit_ways(['ghci']), extra_run_opts('10000 +RTS -A8k -RTS') ], compile_and_run, [''])
 
-# I couldn't reproduce 9078 with the -threaded runtime, but could easily
-# with the non-threaded one.
-test('T9078', [ omit_ways(threaded_ways) ], compile_and_run, ['-with-rtsopts="-DS" -debug'])
+# T9078 needs to be compiled with -debug, which threaded1 does for us.
+# Assert failure is reproducible with ghc-7.8.2.
+test('T9078', only_ways(['threaded1']), compile_and_run, [''])
 
 test('T10017', [ when(opsys('mingw32'), skip)
                , only_ways(threaded_ways), extra_run_opts('+RTS -N2 -RTS') ], compile_and_run, [''])



More information about the ghc-commits mailing list