diff options
| author | David Terei <davidterei@gmail.com> | 2011-06-21 15:46:35 -0700 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2011-06-21 15:46:35 -0700 |
| commit | 6826e084e4aab0fa0bfd6bddd7fec90686cb3ead (patch) | |
| tree | 38859c3cc616310380017953a0040d86f62b8230 /testsuite/tests/ghc-regress | |
| parent | 8fefa250daa0fd9c088fee49cb73ed4399388010 (diff) | |
| download | haskell-6826e084e4aab0fa0bfd6bddd7fec90686cb3ead.tar.gz | |
Fix up testsuite for SafeHaskell
Diffstat (limited to 'testsuite/tests/ghc-regress')
5 files changed, 12 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout b/testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout index edfa92dd34..fb3ecdf6e8 100644 --- a/testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout +++ b/testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout @@ -17,6 +17,7 @@ author: simonmar@microsoft.com exposed: True exposed-modules: A hidden-modules: B C.D +trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" hs-libraries: testpkg-1.2.3.4 @@ -50,6 +51,7 @@ author: simonmar@microsoft.com exposed: True exposed-modules: A hidden-modules: B C.D +trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" hs-libraries: testpkg-1.2.3.4 @@ -89,6 +91,7 @@ author: simonmar@microsoft.com exposed: False exposed-modules: A hidden-modules: B C.D C.E +trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" hs-libraries: testpkg-2.0 @@ -122,6 +125,7 @@ author: simonmar@microsoft.com exposed: False exposed-modules: A hidden-modules: B C.D C.E +trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" hs-libraries: testpkg-2.0 @@ -155,6 +159,7 @@ author: simonmar@microsoft.com exposed: True exposed-modules: A hidden-modules: B C.D +trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" hs-libraries: testpkg-1.2.3.4 @@ -195,6 +200,7 @@ author: simonmar@microsoft.com exposed: False exposed-modules: A hidden-modules: B C.D +trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" hs-libraries: testpkg-1.2.3.4 diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg005.hs b/testsuite/tests/ghc-regress/codeGen/should_compile/cg005.hs index 4cfab59614..a25ad4250a 100644 --- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg005.hs +++ b/testsuite/tests/ghc-regress/codeGen/should_compile/cg005.hs @@ -1,8 +1,9 @@ module Bug where
-import Foreign
+import Foreign hiding ( unsafePerformIO )
import Foreign.ForeignPtr
import Data.Char
+import System.IO.Unsafe
data PackedString = PS !(ForeignPtr Word8) !Int !Int
diff --git a/testsuite/tests/ghc-regress/driver/T4437.hs b/testsuite/tests/ghc-regress/driver/T4437.hs index a348e47c2a..53234bcb06 100644 --- a/testsuite/tests/ghc-regress/driver/T4437.hs +++ b/testsuite/tests/ghc-regress/driver/T4437.hs @@ -6,7 +6,7 @@ import DynFlags import Language.Haskell.Extension main :: IO () -main = do let ghcExtensions = [ ext | (ext, _, _) <- xFlags ] +main = do let ghcExtensions = [ ext | (ext, _, _, _) <- xFlags ] cabalExtensions = map show [ toEnum 0 :: KnownExtension .. ] ghcOnlyExtensions = ghcExtensions \\ cabalExtensions -- These are extensions which are deliberately not yet diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi005.hs b/testsuite/tests/ghc-regress/ffi/should_run/ffi005.hs index 14969228ff..63de9558f9 100644 --- a/testsuite/tests/ghc-regress/ffi/should_run/ffi005.hs +++ b/testsuite/tests/ghc-regress/ffi/should_run/ffi005.hs @@ -1,7 +1,7 @@ -- !!! test for foreign import dynamic/wrapper, orignally by Alastair Reid, -- with a few changes to get it to run on GHC by Simon Marlow. -import Foreign +import Foreign hiding ( unsafePerformIO ) import Foreign.C import Control.Exception import System.IO.Unsafe diff --git a/testsuite/tests/ghc-regress/rts/4059.hs b/testsuite/tests/ghc-regress/rts/4059.hs index 699dd117b2..5af5bbc4aa 100644 --- a/testsuite/tests/ghc-regress/rts/4059.hs +++ b/testsuite/tests/ghc-regress/rts/4059.hs @@ -1,8 +1,9 @@ {-# LANGUAGE ForeignFunctionInterface #-} -import Foreign +import Foreign hiding ( unsafePerformIO ) import Foreign.C +import System.IO.Unsafe d f x = unsafePerformIO $ do g <- mkfun f |