summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw326
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr4
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr3
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/all.T28
16 files changed, 14 insertions, 57 deletions
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr
deleted file mode 100644
index 134cbbe20b..0000000000
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered01.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-[1 of 2] Compiling SafeInfered01_A ( SafeInfered01_A.hs, SafeInfered01_A.o )
-[2 of 2] Compiling SafeInfered01 ( SafeInfered01.hs, SafeInfered01.o )
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr
deleted file mode 100644
index ffbce376b1..0000000000
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered02.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-[1 of 2] Compiling SafeInfered02_A ( SafeInfered02_A.hs, SafeInfered02_A.o )
-[2 of 2] Compiling SafeInfered02 ( SafeInfered02.hs, SafeInfered02.o )
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr
deleted file mode 100644
index 18940a98f2..0000000000
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered03.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-[1 of 2] Compiling SafeInfered03_A ( SafeInfered03_A.hs, SafeInfered03_A.o )
-[2 of 2] Compiling SafeInfered03 ( SafeInfered03.hs, SafeInfered03.o )
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr
deleted file mode 100644
index c264464886..0000000000
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered04.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-[1 of 2] Compiling SafeInfered04_A ( SafeInfered04_A.hs, SafeInfered04_A.o )
-[2 of 2] Compiling SafeInfered04 ( SafeInfered04.hs, SafeInfered04.o )
diff --git a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
index 664d3fa298..a74f55b6cf 100644
--- a/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/SafeInfered05.stderr
@@ -1,8 +1,6 @@
SafeInfered05.hs:3:14: warning: [-Wdeprecated-flags (in -Wdefault)]
-XOverlappingInstances is deprecated: instead use per-instance pragmas OVERLAPPING/OVERLAPPABLE/OVERLAPS
-[1 of 2] Compiling SafeInfered05_A ( SafeInfered05_A.hs, SafeInfered05_A.o )
SafeInfered05_A.hs:3:17: warning: [-Wsafe]
‘SafeInfered05_A’ has been inferred as safe!
-[2 of 2] Compiling SafeInfered05 ( SafeInfered05.hs, SafeInfered05.o )
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
index 2698172348..ab2707bc59 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered01.stderr
@@ -1,6 +1,3 @@
-[1 of 2] Compiling UnsafeInfered01_A ( UnsafeInfered01_A.hs, UnsafeInfered01_A.o )
-[2 of 2] Compiling UnsafeInfered01 ( UnsafeInfered01.hs, UnsafeInfered01.o )
-
UnsafeInfered01.hs:5:1: error:
UnsafeInfered01_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
index 203e241c99..f03a7bb314 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
@@ -1,6 +1,3 @@
-[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o, UnsafeInfered02_A.dyn_o )
-[2 of 2] Compiling UnsafeInfered02 ( UnsafeInfered02.hs, UnsafeInfered02.o, UnsafeInfered02.dyn_o )
-
UnsafeInfered02.hs:5:1: error:
UnsafeInfered02_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32 b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32
deleted file mode 100644
index f8a6b103fe..0000000000
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr-mingw32
+++ /dev/null
@@ -1,6 +0,0 @@
-[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o )
-[2 of 2] Compiling UnsafeInfered02 ( UnsafeInfered02.hs, UnsafeInfered02.o )
-
-UnsafeInfered02.hs:5:1: error:
- UnsafeInfered02_A: Can't be safely imported!
- The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
index b722af9bc9..14af9f7841 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered03.stderr
@@ -1,6 +1,3 @@
-[1 of 2] Compiling UnsafeInfered03_A ( UnsafeInfered03_A.hs, UnsafeInfered03_A.o )
-[2 of 2] Compiling UnsafeInfered03 ( UnsafeInfered03.hs, UnsafeInfered03.o )
-
UnsafeInfered03.hs:5:1: error:
UnsafeInfered03_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
index 4a0eb8000d..52684af861 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered05.stderr
@@ -1,6 +1,3 @@
-[1 of 2] Compiling UnsafeInfered05_A ( UnsafeInfered05_A.hs, UnsafeInfered05_A.o )
-[2 of 2] Compiling UnsafeInfered05 ( UnsafeInfered05.hs, UnsafeInfered05.o )
-
UnsafeInfered05.hs:5:1: error:
UnsafeInfered05_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
index 623f4aea3c..e683e04bd6 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered06.stderr
@@ -1,6 +1,3 @@
-[1 of 2] Compiling UnsafeInfered06_A ( UnsafeInfered06_A.hs, UnsafeInfered06_A.o )
-[2 of 2] Compiling UnsafeInfered06 ( UnsafeInfered06.hs, UnsafeInfered06.o )
-
UnsafeInfered06.hs:5:1: error:
UnsafeInfered06_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
deleted file mode 100644
index 36f4ded2d5..0000000000
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered08.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-[1 of 2] Compiling UnsafeInfered08_A ( UnsafeInfered08_A.hs, UnsafeInfered08_A.o )
-[2 of 2] Compiling UnsafeInfered08 ( UnsafeInfered08.hs, UnsafeInfered08.o )
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
index b5ddab3f35..9c34e74321 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered09.stderr
@@ -1,7 +1,3 @@
-[1 of 3] Compiling UnsafeInfered09_B ( UnsafeInfered09_B.hs, UnsafeInfered09_B.o )
-[2 of 3] Compiling UnsafeInfered09_A ( UnsafeInfered09_A.hs, UnsafeInfered09_A.o )
-[3 of 3] Compiling UnsafeInfered09 ( UnsafeInfered09.hs, UnsafeInfered09.o )
-
UnsafeInfered09.hs:5:1: error:
UnsafeInfered09_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
index fb4488000b..7f1c3fa9c7 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered10.stderr
@@ -1,6 +1,3 @@
-[1 of 2] Compiling UnsafeInfered10_A ( UnsafeInfered10_A.hs, UnsafeInfered10_A.o )
-[2 of 2] Compiling UnsafeInfered10 ( UnsafeInfered10.hs, UnsafeInfered10.o )
-
UnsafeInfered10.hs:6:1: error:
UnsafeInfered10_A: Can't be safely imported!
The module itself isn't safe.
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
index 31a8488b74..8f08181038 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered11.stderr
@@ -1,12 +1,9 @@
-[1 of 2] Compiling UnsafeInfered11_A ( UnsafeInfered11_A.hs, UnsafeInfered11_A.o )
-
UnsafeInfered11_A.hs:2:17: warning: [-Wunsafe]
‘UnsafeInfered11_A’ has been inferred as unsafe!
Reason:
UnsafeInfered11_A.hs:18:11: warning:
Rule "lookupx/T" ignored
User defined rules are disabled under Safe Haskell
-[2 of 2] Compiling UnsafeInfered11 ( UnsafeInfered11.hs, UnsafeInfered11.o )
UnsafeInfered11.hs:6:1: error:
UnsafeInfered11_A: Can't be safely imported!
diff --git a/testsuite/tests/safeHaskell/safeInfered/all.T b/testsuite/tests/safeHaskell/safeInfered/all.T
index 87fe5778a5..cb38505d5d 100644
--- a/testsuite/tests/safeHaskell/safeInfered/all.T
+++ b/testsuite/tests/safeHaskell/safeInfered/all.T
@@ -8,24 +8,24 @@ def f( name, opts ):
setTestOpts(f)
# Tests that should compile fine as they should be inferred safe
-test('SafeInfered01', [], multimod_compile, ['SafeInfered01', ''])
-test('SafeInfered02', [], multimod_compile, ['SafeInfered02', ''])
-test('SafeInfered03', [], multimod_compile, ['SafeInfered03', ''])
-test('SafeInfered04', [], multimod_compile, ['SafeInfered04', ''])
-test('SafeInfered05', [], multimod_compile, ['SafeInfered05', ''])
+test('SafeInfered01', [], multimod_compile, ['SafeInfered01', '-v0'])
+test('SafeInfered02', [], multimod_compile, ['SafeInfered02', '-v0'])
+test('SafeInfered03', [], multimod_compile, ['SafeInfered03', '-v0'])
+test('SafeInfered04', [], multimod_compile, ['SafeInfered04', '-v0'])
+test('SafeInfered05', [], multimod_compile, ['SafeInfered05', '-v0'])
# Tests that should fail to compile as they should be inferred unsafe
-test('UnsafeInfered01', [], multimod_compile_fail, ['UnsafeInfered01', ''])
-test('UnsafeInfered02', [], multimod_compile_fail, ['UnsafeInfered02', ''])
-test('UnsafeInfered03', [], multimod_compile_fail, ['UnsafeInfered03', ''])
-test('UnsafeInfered05', [], multimod_compile_fail, ['UnsafeInfered05', ''])
-test('UnsafeInfered06', [], multimod_compile_fail, ['UnsafeInfered06', ''])
-test('UnsafeInfered08', [], multimod_compile, ['UnsafeInfered08', ''])
-test('UnsafeInfered09', [], multimod_compile_fail, ['UnsafeInfered09', ''])
+test('UnsafeInfered01', [], multimod_compile_fail, ['UnsafeInfered01', '-v0'])
+test('UnsafeInfered02', [], multimod_compile_fail, ['UnsafeInfered02', '-v0'])
+test('UnsafeInfered03', [], multimod_compile_fail, ['UnsafeInfered03', '-v0'])
+test('UnsafeInfered05', [], multimod_compile_fail, ['UnsafeInfered05', '-v0'])
+test('UnsafeInfered06', [], multimod_compile_fail, ['UnsafeInfered06', '-v0'])
+test('UnsafeInfered08', [], multimod_compile, ['UnsafeInfered08', '-v0'])
+test('UnsafeInfered09', [], multimod_compile_fail, ['UnsafeInfered09', '-v0'])
# Test that should fail as we disable safe inference
-test('UnsafeInfered10', [], multimod_compile_fail, ['UnsafeInfered10', ''])
-test('UnsafeInfered11', [], multimod_compile_fail, ['UnsafeInfered11', ''])
+test('UnsafeInfered10', [], multimod_compile_fail, ['UnsafeInfered10', '-v0'])
+test('UnsafeInfered11', [], multimod_compile_fail, ['UnsafeInfered11', '-v0'])
# Test TH is unsafe
test('UnsafeInfered12', normal, compile_fail, [''])