diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2014-10-07 08:48:06 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-10-07 08:48:07 -0500 |
| commit | b3e5a7b50428edc07d11ef4db316c20029f7a3df (patch) | |
| tree | 3b4d7e1be9c25581ae7ff0245f721eabd148f459 /testsuite/tests/concurrent | |
| parent | 460eebec65811c6a7bbe11645df322dda868e80d (diff) | |
| download | haskell-b3e5a7b50428edc07d11ef4db316c20029f7a3df.tar.gz | |
Delete __GLASGOW_HASKELL__ ifdefs for stage0 < 7.6.
Summary:
My understanding is that ghc 7.10 should be buildable with the last 3 versions
of ghc, i.e 7.6, 7.8 and 7.10 itself.
Test Plan: x
Reviewers: austin
Reviewed By: austin
Subscribers: hvr, simonmar, ezyang, carter, thomie
Differential Revision: https://phabricator.haskell.org/D254
Diffstat (limited to 'testsuite/tests/concurrent')
5 files changed, 0 insertions, 16 deletions
diff --git a/testsuite/tests/concurrent/should_run/conc024.hs b/testsuite/tests/concurrent/should_run/conc024.hs index c1410828fa..9a82320e73 100644 --- a/testsuite/tests/concurrent/should_run/conc024.hs +++ b/testsuite/tests/concurrent/should_run/conc024.hs @@ -3,9 +3,6 @@ module Main where import Control.Exception import Control.Concurrent -#if __GLASGOW_HASKELL__ < 705 -import Prelude hiding (catch) -#endif import System.Mem -- illustrates the BlockOnDeadMVar exception diff --git a/testsuite/tests/concurrent/should_run/conc029.hs b/testsuite/tests/concurrent/should_run/conc029.hs index ceca99d2dc..cca4ccfe1d 100644 --- a/testsuite/tests/concurrent/should_run/conc029.hs +++ b/testsuite/tests/concurrent/should_run/conc029.hs @@ -3,9 +3,6 @@ module Main where import Control.Exception import Control.Concurrent -#if __GLASGOW_HASKELL__ < 705 -import Prelude hiding (catch) -#endif -- the BlockOnDeadMVar exception doesn't cause any output by default diff --git a/testsuite/tests/concurrent/should_run/conc030.hs b/testsuite/tests/concurrent/should_run/conc030.hs index 658feb322a..b2f439cafe 100644 --- a/testsuite/tests/concurrent/should_run/conc030.hs +++ b/testsuite/tests/concurrent/should_run/conc030.hs @@ -3,9 +3,6 @@ module Main where import Control.Exception import Control.Concurrent -#if __GLASGOW_HASKELL__ < 705 -import Prelude hiding (catch) -#endif -- the ThreadKilled exception doesn't cause any output by default diff --git a/testsuite/tests/concurrent/should_run/conc034.hs b/testsuite/tests/concurrent/should_run/conc034.hs index 993b961680..85852d6532 100644 --- a/testsuite/tests/concurrent/should_run/conc034.hs +++ b/testsuite/tests/concurrent/should_run/conc034.hs @@ -5,10 +5,6 @@ import Foreign import System.IO (hFlush,stdout) -#if __GLASGOW_HASKELL__ < 705 -import Prelude hiding (catch) -#endif - -- !!! Try to get two threads into a knot depending on each other. -- This should result in the main thread being sent a NonTermination diff --git a/testsuite/tests/concurrent/should_run/foreignInterruptible.hs b/testsuite/tests/concurrent/should_run/foreignInterruptible.hs index 52da549380..73585ec43b 100644 --- a/testsuite/tests/concurrent/should_run/foreignInterruptible.hs +++ b/testsuite/tests/concurrent/should_run/foreignInterruptible.hs @@ -3,9 +3,6 @@ module Main where import Control.Concurrent import Control.Exception -#if __GLASGOW_HASKELL__ < 705 -import Prelude hiding (catch) -#endif import Foreign import System.IO |