summaryrefslogtreecommitdiff
path: root/testsuite/tests/safeHaskell
diff options
context:
space:
mode:
authorDavid Terei <davidterei@gmail.com>2011-07-20 17:11:16 -0700
committerDavid Terei <davidterei@gmail.com>2011-07-20 17:11:16 -0700
commit7f6976282181562a270cf63a4e0ddcf9463c3182 (patch)
tree670db22a8a52a80e550872486f58e7616e94f39f /testsuite/tests/safeHaskell
parentfd4250b4596b581e9e80d0072b05ecf4ca4ebc77 (diff)
downloadhaskell-7f6976282181562a270cf63a4e0ddcf9463c3182.tar.gz
Use mutlimod not '--make' in all.T
Diffstat (limited to 'testsuite/tests/safeHaskell')
-rw-r--r--testsuite/tests/safeHaskell/safeLanguage/all.T12
-rw-r--r--testsuite/tests/safeHaskell/unsafeLibs/all.T4
2 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T
index 122050dcb3..1e3fb31dee 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/all.T
+++ b/testsuite/tests/safeHaskell/safeLanguage/all.T
@@ -13,10 +13,10 @@ test('SafeLang06', normal, compile_and_run, [''])
test('SafeLang07', normal, compile_fail, [''])
test('SafeLang08', normal, compile_fail, [''])
test('SafeLang09', exit_code(1), compile_and_run, [''])
-test('SafeLang10', normal, compile_fail, ['--make -trust base'])
-test('SafeLang11', req_interp, compile_and_run, ['--make -trust base'])
-test('SafeLang12', normal, compile_fail, ['--make -trust base'])
-test('SafeLang13', normal, compile_and_run, ['--make -trust base'])
-test('SafeLang14', normal, compile_fail, ['--make -trust base -XSafe'])
-test('SafeLang15', exit_code(1), compile_and_run, ['--make -trust base -XSafe'])
+test('SafeLang10', normal, multimod_compile_fail, ['SafeLang10', '-trust base'])
+test('SafeLang11', req_interp, multimod_compile_and_run, ['SafeLang11', '-trust base'])
+test('SafeLang12', normal, multimod_compile_fail, ['SafeLang12', '-trust base'])
+test('SafeLang13', normal, multimod_compile_and_run, ['SafeLang13', '-trust base'])
+test('SafeLang14', normal, multimod_compile_fail, ['SafeLang14', '-trust base -XSafe'])
+test('SafeLang15', exit_code(1), multimod_compile_and_run, ['SafeLang15', '-trust base -XSafe'])
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/all.T b/testsuite/tests/safeHaskell/unsafeLibs/all.T
index c985b65c3c..839da38f67 100644
--- a/testsuite/tests/safeHaskell/unsafeLibs/all.T
+++ b/testsuite/tests/safeHaskell/unsafeLibs/all.T
@@ -16,6 +16,6 @@ test('Dep09', normal, compile, [''])
test('Dep10', normal, compile, [''])
test('BadImport01', normal, compile_fail, [''])
-test('BadImport02', normal, compile_and_run, ['--make'])
-test('BadImport03', normal, compile_fail, ['--make'])
+test('BadImport02', normal, multimod_compile_and_run, ['BadImport02', ''])
+test('BadImport03', normal, multimod_compile_fail, ['BadImport03', ''])