diff options
Diffstat (limited to 'testsuite/tests/safeHaskell/safeLanguage')
6 files changed, 13 insertions, 16 deletions
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_A.hs index 129c2c4b56..ff89183f93 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_A.hs +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_A.hs @@ -12,4 +12,3 @@ class Pos a where instance Pos [a] where res _ = True - diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_B.hs index 76e0fe5a1c..d03a6296ca 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_B.hs +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_B.hs @@ -16,4 +16,3 @@ instance Pos [Int] where function :: Int function = 3 - diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.hs index ff5c168cff..5c88d3916d 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.hs +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE SafeImports #-} +{-# LANGUAGE Trustworthy #-} module Main where import safe SafeLang10_A -- trusted lib @@ -9,4 +9,3 @@ main = do putStrLn $ "Result: " ++ show r putStrLn $ "Result: " ++ show function - diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs index 5f1e51c956..f6fce3b73f 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs @@ -1,5 +1,5 @@ -{-# LANGUAGE Safe #-} {-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE Safe #-} module Main where import SafeLang12_A diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs index e8269c129d..1e5b2252cb 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs +++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs @@ -15,4 +15,3 @@ mkSimpleClass name = do return [InstanceD [] (AppT (ConT cname) (ConT dname)) [FunD mname [Clause [] (NormalB (ConE conname)) []]]] - diff --git a/testsuite/tests/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T index cd31bf570c..75ebad8e90 100644 --- a/testsuite/tests/safeHaskell/safeLanguage/all.T +++ b/testsuite/tests/safeHaskell/safeLanguage/all.T @@ -9,11 +9,11 @@ def f( opts ): setTestOpts(f) -test('SafeLang01', normal, compile, ['-trust base']) -test('SafeLang02', normal, compile, ['-trust base']) -test('SafeLang03', normal, compile, ['-trust base']) +test('SafeLang01', normal, compile, ['']) +test('SafeLang02', normal, compile, ['']) +test('SafeLang03', normal, compile, ['']) test('SafeLang04', normal, compile_and_run, ['']) -test('SafeLang05', normal, compile_and_run, ['-trust base']) +test('SafeLang05', normal, compile_and_run, ['']) test('SafeLang06', extra_clean(['SafeLang06_A.o', 'SafeLang06_A.hi']), compile_and_run, @@ -30,25 +30,26 @@ test('SafeLang10', extra_clean(['SafeLang10_A.o', 'SafeLang10_A.hi', 'SafeLang10_B.o', 'SafeLang10_B.hi']), multimod_compile_fail, - ['SafeLang10', '-trust base']) + ['SafeLang10', '']) test('SafeLang11', [req_interp, extra_clean(['SafeLang11_A.o', 'SafeLang11_A.hi', 'SafeLang11_B.o', 'SafeLang11_B.hi'])], multimod_compile_and_run, - ['SafeLang11', '-trust base']) -test('SafeLang12', normal, multimod_compile_fail, ['SafeLang12', '-trust base']) + ['SafeLang11', '']) +test('SafeLang12', normal, multimod_compile_fail, ['SafeLang12', '']) test('SafeLang13', extra_clean(['SafeLang13_A.o', 'SafeLang13_A.hi']), multimod_compile_and_run, - ['SafeLang13', '-trust base']) + ['SafeLang13', '']) test('SafeLang14', extra_clean(['SafeLang14_A.o', 'SafeLang14_A.hi']), multimod_compile_fail, - ['SafeLang14', '-trust base -XSafe']) + ['SafeLang14', '-XSafe']) test('SafeLang15', [exit_code(1), extra_clean(['SafeLang15_A.o', 'SafeLang15_A.hi'])], multimod_compile_and_run, - ['SafeLang15', '-trust base -XSafe']) + ['SafeLang15', '-XSafe']) test('SafeLang16', normal, compile, ['']) + |