[project @ 2005-05-06 12:13:54 by ross]

Rearrange arrows tests, and move tc120fail to arrowfail003.

35 files changed, 27 insertions, 22 deletions

diff --git a/testsuite/tests/ghc-regress/arrows/arrow2.stderr b/testsuite/tests/ghc-regress/arrows/arrow2.stderr
deleted file mode 100644
index 777f8c716f..0000000000
--- a/testsuite/tests/ghc-regress/arrows/arrow2.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-
-arrow2.hs:6:16: Not in scope: `x'
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/Makefile b/testsuite/tests/ghc-regress/arrows/should_compile/Makefile
new file mode 100644
index 0000000000..1c39d1c1fe
--- /dev/null
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/Makefile
@@ -0,0 +1,3 @@
+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/arrows/all.T b/testsuite/tests/ghc-regress/arrows/should_compile/all.T
index 87d114506d..72d230fc2b 100644
--- a/testsuite/tests/ghc-regress/arrows/all.T
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/all.T
@@ -1,7 +1,5 @@
 setTestOpts(only_compiler_types(['ghc']))
 
-test('arrow1', normal, compile_fail, [''])
-test('arrow2', normal, compile_fail, [''])
 test('arrowapply1', normal, compile, [''])
 test('arrowapply2', normal, compile, [''])
 test('arrowapply3', normal, compile, [''])
@@ -15,16 +13,3 @@ test('arrowform1', normal, compile, [''])
 test('arrowif1', normal, compile, [''])
 test('arrowlet1', normal, compile, [''])
 test('arrowrec1', normal, compile, [''])
-
-test('arrowex1', normal, compile_and_run, [''])
-test('arrowex2', normal, compile_and_run, [''])
-test('arrowex3', normal, compile_and_run, [''])
-test('arrowex4', normal, compile_and_run, [''])
-
-# test('mod1', normal, compile_fail, [''])
-# test('mod2', normal, compile_fail, [''])
-# test('mod3', normal, compile_fail, [''])
-# test('mod4', normal, compile_fail, [''])
-# test('mod5', normal, compile, [''])
-# test('mod6', normal, compile, [''])
-# test('mod7', normal, compile_fail, [''])
diff --git a/testsuite/tests/ghc-regress/arrows/arrowapply1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs
index a7db72dd7e..a7db72dd7e 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowapply1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowapply2.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs
index a18c3cfaaf..a18c3cfaaf 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowapply2.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowapply3.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs
index 6517880751..6517880751 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowapply3.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowapply4.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs
index 4c4c0af0b7..4c4c0af0b7 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowapply4.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowapply5.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs
index 8c3cace94e..8c3cace94e 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowapply5.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowcase1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs
index 9c30ae9527..9c30ae9527 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowcase1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowdo1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs
index cfa7c93d4a..cfa7c93d4a 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowdo1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowdo2.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs
index 8237f224e6..8237f224e6 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowdo2.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowdo3.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs
index c95533e610..c95533e610 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowdo3.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowform1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs
index 6af747683a..6af747683a 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowform1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowif1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs
index a5294b6025..a5294b6025 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowif1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowlet1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs
index d3e016091e..d3e016091e 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowlet1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowrec1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs
index 5be2afdfc1..5be2afdfc1 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowrec1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/Makefile b/testsuite/tests/ghc-regress/arrows/should_fail/Makefile
new file mode 100644
index 0000000000..1c39d1c1fe
--- /dev/null
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/all.T b/testsuite/tests/ghc-regress/arrows/should_fail/all.T
new file mode 100644
index 0000000000..69ae4e653e
--- /dev/null
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/all.T
@@ -0,0 +1,5 @@
+setTestOpts(only_compiler_types(['ghc']))
+
+test('arrowfail001', normal, compile_fail, [''])
+test('arrowfail002', normal, compile_fail, [''])
+test('arrowfail003', normal, compile_fail, [''])
diff --git a/testsuite/tests/ghc-regress/arrows/arrow1.hs b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs
index 2e77e87321..2e77e87321 100644
--- a/testsuite/tests/ghc-regress/arrows/arrow1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrow1.stderr b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr
index abe6584bfb..593b3f0851 100644
--- a/testsuite/tests/ghc-regress/arrows/arrow1.stderr
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr
@@ -1,5 +1,5 @@
 
-arrow1.hs:15:35:
+arrowfail001.hs:15:35:
     Ambiguous type variable `a' in the constraint:
-      `Foo a' arising from use of `foo' at arrow1.hs:15:35-37
+      `Foo a' arising from use of `foo' at arrowfail001.hs:15:35-37
     Probable fix: add a type signature that fixes these type variable(s)
diff --git a/testsuite/tests/ghc-regress/arrows/arrow2.hs b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs
index 4352c13566..4352c13566 100644
--- a/testsuite/tests/ghc-regress/arrows/arrow2.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.stderr b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.stderr
new file mode 100644
index 0000000000..890f6eb5ab
--- /dev/null
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.stderr
@@ -0,0 +1,2 @@
+
+arrowfail002.hs:6:16: Not in scope: `x'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.hs b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs
index 1736e768c4..bc1a270a84 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS -farrows #-}
 -- Arrow commands where an expression is expected
 
 module ShouldFail where
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.stderr b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.stderr
index 95873d2125..3db93e44eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.stderr
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.stderr
@@ -1,11 +1,11 @@
 
-tcfail120.hs:7:6:
+arrowfail003.hs:8:6:
     The arrow command
       returnA -< []
     was found where an expression was expected
     In the definition of `foo': foo = returnA -< []
 
-tcfail120.hs:8:6:
+arrowfail003.hs:9:6:
     The arrow command
       (|zeroArrow |)
     was found where an expression was expected
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/Makefile b/testsuite/tests/ghc-regress/arrows/should_run/Makefile
new file mode 100644
index 0000000000..1c39d1c1fe
--- /dev/null
+++ b/testsuite/tests/ghc-regress/arrows/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/all.T b/testsuite/tests/ghc-regress/arrows/should_run/all.T
new file mode 100644
index 0000000000..bb109f7981
--- /dev/null
+++ b/testsuite/tests/ghc-regress/arrows/should_run/all.T
@@ -0,0 +1,6 @@
+setTestOpts(only_compiler_types(['ghc']))
+
+test('arrowrun001', normal, compile_and_run, [''])
+test('arrowrun002', normal, compile_and_run, [''])
+test('arrowrun003', normal, compile_and_run, [''])
+test('arrowrun004', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex1.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs
index ff0cf55c5a..ff0cf55c5a 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex1.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex1.stdout b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.stdout
index 349103a876..349103a876 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex1.stdout
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex2.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs
index 7fdbff08da..7fdbff08da 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex2.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex2.stdout b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.stdout
index b13ce3b37a..b13ce3b37a 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex2.stdout
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex3.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs
index 72bec6743b..72bec6743b 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex3.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex3.stdout b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.stdout
index 21a7156d60..21a7156d60 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex3.stdout
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex4.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs
index 3d6a3d5bfd..3d6a3d5bfd 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex4.hs
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs
diff --git a/testsuite/tests/ghc-regress/arrows/arrowex4.stdout b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.stdout
index cbb71fdd82..cbb71fdd82 100644
--- a/testsuite/tests/ghc-regress/arrows/arrowex4.stdout
+++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/all.T b/testsuite/tests/ghc-regress/typecheck/should_fail/all.T
index c0b2d3ec91..3dc8e027a7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/all.T
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/all.T
@@ -105,7 +105,6 @@ test('tcfail116', normal, compile_fail, [''])
 test('tcfail117', normal, compile_fail, [''])
 test('tcfail118', normal, compile_fail, [''])
 test('tcfail119', normal, compile_fail, [''])
-test('tcfail120', only_compiler_types(['ghc']), compile_fail, ['-farrows'])
 test('tcfail121', normal, compile_fail, [''])
 test('tcfail122', only_compiler_types(['ghc']), compile_fail, [''])
 test('tcfail123', only_compiler_types(['ghc']), compile_fail, [''])