Merge branch 'master' of http://darcs.haskell.org/testsuite

4 files changed, 27 insertions, 0 deletions

diff --git a/testsuite/tests/codeGen/should_run/6146.hs b/testsuite/tests/codeGen/should_run/6146.hs
new file mode 100644
index 0000000000..1142f5fabd
--- /dev/null
+++ b/testsuite/tests/codeGen/should_run/6146.hs
@@ -0,0 +1,20 @@
+-- Test #6146 (a bug in -feager-blackholing) I couldn't reliably
+-- reproduce it, but this program occasionally triggers it so it's
+-- better than nothing.
+
+module Main (main) where
+
+import System.IO
+import Control.Concurrent
+import System.Mem
+
+main :: IO ()
+main = do
+    putStrLn "First number?  "
+    num1 <- readLn :: IO Int
+    performGC -- provokes bug (sometimes)
+    putStrLn "Second number? "
+    num2 <- readLn :: IO Int
+    let total = num1 + num2
+    putStrLn $ "The sum is " ++ (show total) ++ "."
+
diff --git a/testsuite/tests/codeGen/should_run/6146.stdin b/testsuite/tests/codeGen/should_run/6146.stdin
new file mode 100644
index 0000000000..4792e70f33
--- /dev/null
+++ b/testsuite/tests/codeGen/should_run/6146.stdin
@@ -0,0 +1,2 @@
+2
+3
diff --git a/testsuite/tests/codeGen/should_run/6146.stdout b/testsuite/tests/codeGen/should_run/6146.stdout
new file mode 100644
index 0000000000..e6ce1acc30
--- /dev/null
+++ b/testsuite/tests/codeGen/should_run/6146.stdout
@@ -0,0 +1,3 @@
+First number?  
+Second number? 
+The sum is 5.
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 5e268eba98..272eb4ac48 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -91,3 +91,5 @@ test('5747', if_arch('i386', extra_hc_opts('-msse2')), compile_and_run, ['-O2'])
 test('5785', normal, compile_and_run, [''])
 test('setByteArray', normal, compile_and_run, [''])
 
+test('6146', normal, compile_and_run, [''])
+