Move tests from tests/ghc-regress/* to just tests/*

1 files changed, 27 insertions, 0 deletions

diff --git a/testsuite/tests/concurrent/should_run/conc016.hs b/testsuite/tests/concurrent/should_run/conc016.hs
new file mode 100644
index 0000000000..639b4306b3
--- /dev/null
+++ b/testsuite/tests/concurrent/should_run/conc016.hs
@@ -0,0 +1,27 @@
+import Control.Concurrent
+import Control.Exception
+
+-- check that we can still kill a thread that is blocked on
+-- delivering an exception to us.
+
+-- NB. this test is non-deterministic in the threaded2 way since 6.14,
+-- because throwTo is now always interruptible, so the main thread's
+-- killThread can be legitimately interrupted by the child thread's
+-- killThread, rather than the other way around.  This happens because
+-- the child thread is running on another processor, so the main
+-- thread's throwTo is blocked waiting for a response, and while
+-- waiting it is interruptible.
+
+main = do
+  main_thread <- myThreadId
+  m <- newEmptyMVar
+  sub_thread <- forkIO (do
+	    	 	 takeMVar m
+	    	 	 throwTo main_thread (ErrorCall "foo")
+	 		)
+  mask_ $ do
+    putMVar m ()
+    sum [1..10000] `seq` -- to be sure the other thread is now blocked
+      killThread sub_thread
+
+  putStrLn "ok"