summaryrefslogtreecommitdiff
path: root/testsuite/tests/concurrent
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2013-07-22 10:13:33 +0100
committerSimon Marlow <marlowsd@gmail.com>2013-07-24 11:48:12 +0100
commit5aaca55f112a90c74455db4e8e08e8ae172de2e4 (patch)
tree2de30a2b42c8ae57108211ed5cbb48404d4aedbf /testsuite/tests/concurrent
parentaae675108c4b040a823090cc0f681ffd340735b3 (diff)
downloadhaskell-5aaca55f112a90c74455db4e8e08e8ae172de2e4.tar.gz
Add output for T7970, make it run when 'fast', and remove bogus file
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r--testsuite/tests/concurrent/should_run/.hpc.conc067/Main.mix1
-rw-r--r--testsuite/tests/concurrent/should_run/T7970.stdout4
-rw-r--r--testsuite/tests/concurrent/should_run/all.T4
3 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/tests/concurrent/should_run/.hpc.conc067/Main.mix b/testsuite/tests/concurrent/should_run/.hpc.conc067/Main.mix
deleted file mode 100644
index 39262a5aeb..0000000000
--- a/testsuite/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/testsuite/tests/concurrent/should_run/T7970.stdout b/testsuite/tests/concurrent/should_run/T7970.stdout
new file mode 100644
index 0000000000..7753971018
--- /dev/null
+++ b/testsuite/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/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 454969eaee..b660c8d708 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/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, [''])