[project @ 2002-07-31 14:24:18 by simonmar]

Revamp the testsuite framework.  The previous framework was an
experiment that got a little out of control - a whole new language
with an interpreter written in Haskell was rather heavyweight and left
us with a maintenance problem.

So the new test driver is written in Python.  The downside is that you
need Python to run the testsuite, but we don't think that's too big a
problem since it only affects developers and Python installs pretty
easily onto everything these days.

Highlights:

  - 790 lines of Python, vs. 5300 lines of Haskell + 720 lines of
    <strange made-up language>.

  - the framework supports running tests in various "ways", which should
    catch more bugs.  By default, each test is run in three ways:
    normal, -O, and -O -fasm.  Additionally, if profiling libraries
    have been built, another way (-O -prof -auto-all) is added.  I plan
    to also add a 'GHCi' way.

    Running tests multiple ways has already shown up some new bugs!

  - documentation is in the README file and is somewhat improved.

  - the framework is rather less GHC-specific, and could without much
    difficulty be coaxed into using other compilers.  Most of the
    GHC-specificness is in a separate configuration file (config/ghc).

Things may need a while to settle down.  Expect some unexpected
failures.

5 files changed, 77 insertions, 80 deletions

diff --git a/testsuite/tests/ghc-regress/rename/Makefile b/testsuite/tests/ghc-regress/rename/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/ghc-regress/rename/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/all.T b/testsuite/tests/ghc-regress/rename/should_compile/all.T
index 8e93b33794..9fa7cd50a7 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/all.T
+++ b/testsuite/tests/ghc-regress/rename/should_compile/all.T
@@ -1,41 +1,38 @@
+# Args to vtc are: extra compile flags
 
-include ($confdir ++ "/../vanilla-test.T")
-
--- Args to vtc are: extra compile flags
-
-test "rn003" { vtc("") }
-test "rn005" { vtc("") }
-test "rn006" { vtc("") }
-test "rn009" { vtc("") }
-test "rn010" { vtc("") }
-test "rn011" { vtc("") }
-test "rn012" { vtc("") }
-test "rn013" { vtc("") }
-test "rn017" { vtc("") }
-test "rn019" { vtc("") }
-test "rn020" { vtc("") }
-test "rn022" { vtc("") }
-test "rn023" { vtc("") }
-test "rn024" { vtc("") }
-test "rn025" { vtc("") }
-test "rn026" { vtc("") }
-test "rn027" { vtc("") }
-test "rn028" { vtc("") }
-test "rn029" { vtc("") }
-test "rn031" { vtc("") }
-test "rn032" { vtc("") }
-test "rn033" { vtc("") }
-test "rn034" { vtc("") }
-test "rn035" { vtc("") }
-test "rn036" { vtc("") }
+test('rn003', normal, compile, [''])
+test('rn005', normal, compile, [''])
+test('rn006', normal, compile, [''])
+test('rn009', normal, compile, [''])
+test('rn010', normal, compile, [''])
+test('rn011', normal, compile, [''])
+test('rn012', normal, compile, [''])
+test('rn013', normal, compile, [''])
+test('rn017', normal, compile, [''])
+test('rn019', normal, compile, [''])
+test('rn020', normal, compile, [''])
+test('rn022', normal, compile, [''])
+test('rn023', normal, compile, [''])
+test('rn024', normal, compile, [''])
+test('rn025', normal, compile, [''])
+test('rn026', normal, compile, [''])
+test('rn027', normal, compile, [''])
+test('rn028', normal, compile, [''])
+test('rn029', normal, compile, [''])
+test('rn031', normal, compile, [''])
+test('rn032', normal, compile, [''])
+test('rn033', normal, compile, [''])
+test('rn034', normal, compile, [''])
+test('rn035', normal, compile, [''])
+test('rn036', normal, compile, [''])
 	
--- really a mulit-module test:
-test "Rn037Help" { vtc("") }
-test "rn037"     { vtc("") }
+# really a mulit-module test:
+test('Rn037Help', normal, compile, [''])
+test('rn037', normal, compile, [''])
 
-test "rn039" { vtc("") }
-test "rn040" { $expect = "fail" vtc("") }
+test('rn039', normal, compile, [''])
+test('rn040', expect_fail, compile, [''])
 
-test "timing001" { vtc("") }
-test "timing002" { vtc("") }
-test "timing003" { vtc("") }
+test('timing001', normal, compile, [''])
+test('timing002', normal, compile, [''])
+test('timing003', normal, compile, [''])
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/all.T b/testsuite/tests/ghc-regress/rename/should_fail/all.T
index ae766953a0..c2046a14ea 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/all.T
+++ b/testsuite/tests/ghc-regress/rename/should_fail/all.T
@@ -1,44 +1,40 @@
 
-include ($confdir ++ "/../vanilla-test.T")
+test('rnfail001', normal, compile_fail, [''])
+test('rnfail002', normal, compile_fail, [''])
+test('rnfail003', normal, compile_fail, [''])
+test('rnfail004', normal, compile_fail, [''])
+test('rnfail007', normal, compile_fail, [''])
+test('rnfail008', normal, compile_fail, [''])
+test('rnfail009', normal, compile_fail, [''])
+test('rnfail010', normal, compile_fail, [''])
+test('rnfail011', normal, compile_fail, [''])
+test('rnfail012', normal, compile_fail, [''])
+test('rnfail013', normal, compile_fail, [''])
+test('rnfail014', normal, compile_fail, [''])
+test('rnfail015', normal, compile_fail, [''])
+test('rnfail016', normal, compile_fail, [''])
+test('rnfail017', normal, compile_fail, [''])
+test('rnfail018', normal, compile_fail, [''])
+test('rnfail019', normal, compile_fail, [''])
+test('rnfail020', normal, compile_fail, [''])
+test('rnfail021', normal, compile_fail, [''])
+test('rnfail022', normal, compile_fail, [''])
+test('rnfail023', normal, compile_fail, [''])
+test('rnfail024', normal, compile_fail, [''])
+test('rnfail025', normal, compile_fail, [''])
+test('rnfail026', normal, compile_fail, [''])
+test('rnfail027', normal, compile_fail, [''])
+test('rnfail028', normal, compile_fail, [''])
+test('rnfail029', normal, compile_fail, [''])
+test('rnfail030', normal, compile_fail, [''])
+test('rnfail031', normal, compile_fail, [''])
+test('rnfail032', normal, compile_fail, [''])
+test('rnfail033', normal, compile_fail, [''])
+test('rnfail034', expect_fail, compile_fail, [''])
+test('rnfail035', normal, compile_fail, [''])
 
--- Args to vtcf are: extra compile flags
+# these two are really a single multi-module test
+test('Rn037Help', normal, compile, [''])
+test('rnfail037', normal, compile_fail, [''])
 
-test "rnfail001" { vtcf("") }
-test "rnfail002" { vtcf("") }
-test "rnfail003" { vtcf("") }
-test "rnfail004" { vtcf("") }
-test "rnfail007" { vtcf("") }
-test "rnfail008" { vtcf("") }
-test "rnfail009" { vtcf("") }
-test "rnfail010" { vtcf("") }
-test "rnfail011" { vtcf("") }
-test "rnfail012" { vtcf("") }
-test "rnfail013" { vtcf("") }
-test "rnfail014" { vtcf("") }
-test "rnfail015" { vtcf("") }
-test "rnfail016" { vtcf("") }
-test "rnfail017" { vtcf("") }
-test "rnfail018" { vtcf("") }
-test "rnfail019" { vtcf("") }
-test "rnfail020" { vtcf("") }
-test "rnfail021" { vtcf("") }
-test "rnfail022" { vtcf("") }
-test "rnfail023" { vtcf("") }
-test "rnfail024" { vtcf("") }
-test "rnfail025" { vtcf("") }
-test "rnfail026" { vtcf("") }
-test "rnfail027" { vtcf("") }
-test "rnfail028" { vtcf("") }
-test "rnfail029" { vtcf("") }
-test "rnfail030" { vtcf("") }
-test "rnfail031" { vtcf("") }
-test "rnfail032" { vtcf("") }
-test "rnfail033" { vtcf("") }
-test "rnfail034" { $expect = "fail" vtcf("") }
-test "rnfail035" { vtcf("") }
-
--- these two are really a multi-module tests
-test "Rn037Help" { vtc("") }
-test "rnfail037" { vtcf("") }
-
-test "rnfail038" { vtcf("") }
+test('rnfail038', normal, compile_fail, [''])
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr b/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr
index e2305c377b..f47d3577c6 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr
+++ b/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr
@@ -2,4 +2,4 @@
 rnfail019.hs:5:
     The operator `:' [infixr 5] of a section
 	must have lower precedence than the operand `(:)' [infixr 5]
-	In the section: `((x : y) :)'
+	in the section: `((x : y) :)'
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr b/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr
index 76a236f690..929295bc02 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr
+++ b/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr
@@ -1,3 +1,4 @@
 
 rnfail021.hs:5:
-    Invalid use of qualified name `Baz.f' in its declaration
+    Invalid use of qualified name `Baz.f'
+    In its declaration