[commit: testsuite] master: Add output for T7970, make it run when 'fast', and remove bogus file (ee47e6e)

Simon Marlow simonmar at ghc.haskell.org
Wed Jul 24 12:48:14 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

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

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

commit ee47e6eaae07059ff4978aa62f7089577520c941
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Jul 22 10:13:33 2013 +0100

    Add output for T7970, make it run when 'fast', and remove bogus file

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

 tests/concurrent/should_run/.hpc.conc067/Main.mix |    1 -
 tests/concurrent/should_run/T7970.stdout          |    4 ++++
 tests/concurrent/should_run/all.T                 |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/concurrent/should_run/.hpc.conc067/Main.mix b/tests/concurrent/should_run/.hpc.conc067/Main.mix
deleted file mode 100644
index 39262a5..0000000
--- a/tests/concurrent/should_run/.hpc.conc067/Main.mix
+++ /dev/null
@@ -1 +0,0 @@
-Mix "conc067.hs" 2011-07-21 13:37:37 UTC 3869899995 8 [(9:10-9:21,ExpBox False),(10:39-10:39,ExpBox False),(10:29-10:40,ExpBox False),(10:10-10:40,ExpBox False),(11:24-11:24,ExpBox False),(11:17-11:25,ExpBox False),(11:10-11:25,ExpBox False),(12:18-12:20,ExpBox False),(12:22-12:25,ExpBox False),(12:17-12:26,ExpBox False),(12:5-12:26,ExpBox False),(13:16-13:16,ExpBox False),(13:5-13:16,ExpBox False),(14:5-14:10,ExpBox False),(14:20-14:20,ExpBox False),(14:14-14:20,ExpBox False),(14:5-14:20,ExpBox False),(15:13-15:13,ExpBox False),(15:15-15:16,ExpBox False),(15:5-15:16,ExpBox False),(8:8-15:16,ExpBox False),(8:1-15:16,TopLevelBox ["main"])]
\ No newline at end of file
diff --git a/tests/concurrent/should_run/T7970.stdout b/tests/concurrent/should_run/T7970.stdout
new file mode 100644
index 0000000..7753971
--- /dev/null
+++ b/tests/concurrent/should_run/T7970.stdout
@@ -0,0 +1,4 @@
+IORef still alive, and contains 'x'
+caught exception: thread blocked indefinitely in an MVar operation
+IORef still alive, and contains 'x'
+'x'
diff --git a/tests/concurrent/should_run/all.T b/tests/concurrent/should_run/all.T
index 454969e..b660c8d 100644
--- a/tests/concurrent/should_run/all.T
+++ b/tests/concurrent/should_run/all.T
@@ -79,6 +79,8 @@ test('readMVar2', normal, compile_and_run, [''])
 test('readMVar3', normal, compile_and_run, [''])
 test('tryReadMVar1', normal, compile_and_run, [''])
 
+test('T7970', normal, compile_and_run, [''])
+
 # -----------------------------------------------------------------------------
 # These tests we only do for a full run
 
@@ -238,5 +240,3 @@ test('setnumcapabilities001',
        reqlib('parallel'),
        skip_if_not_smp ],
      compile_and_run, [''])
-
-test('T7970', normal, compile_and_run, [''])






More information about the ghc-commits mailing list