[project @ 2001-06-19 14:03:39 by sewardj]

Move to new framework.

testsuite/tests/h98/Array/largeArray.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("largeArray.run.stdout") 
-          == contents("largeArray.expect.stdout")
-
-fail when otherwise
\ No newline at end of file
+test "largeArray" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout"))
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}

testsuite/tests/h98/Directory/getDCs.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
--- sigh
-$stuff = contents("getDCs.run.stdout")
-pass when 
-   $stuff contains "bin" &&
-   $stuff contains "lib" &&
-   $stuff contains "include"
-
-fail when otherwise
\ No newline at end of file
+test "getDCs" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   -- sigh
+   $stuff = contents(qualify("run.stdout"))
+   pass when 
+      $stuff contains "bin" &&
+      $stuff contains "lib" &&
+      $stuff contains "include"
+   fail when otherwise
+}

testsuite/tests/h98/EmptyDecls/edecls.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("edecls.run.stdout") == contents("edecls.expect.stdout")
-
-fail when otherwise
\ No newline at end of file
+test "edecls" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}
\ No newline at end of file

testsuite/tests/h98/Enum/all.T

+
+include ($confdir ++ "/../singlefile-macros.T")
+
+test "list" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expected.stdout"))
+   fail when otherwise
+}
+
+test "succ" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}

testsuite/tests/h98/Enum/list.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("list.run.stdout") == contents("list.expected.stdout")
-
-fail when otherwise

testsuite/tests/h98/Enum/succ.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("succ.run.stdout") == contents("succ.expect.stdout")
-
-fail when otherwise
\ No newline at end of file

testsuite/tests/h98/N+K/nplusk.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("nplusk.run.stdout") == contents("nplusk.expect.stdout")
-
-fail when otherwise
\ No newline at end of file
+test "nplusk" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout"))
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}

testsuite/tests/h98/Queens/queens.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("queens.run.stdout") == contents("queens.expect.stdout")
-
-fail when otherwise
\ No newline at end of file
+test "queens" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}

testsuite/tests/h98/chr/chr1.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("chr1.run.stdout") == contents("chr1.expected.stdout")
-
-fail when otherwise
+test "chr1" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expected.stdout"))
+   fail when otherwise
+}

testsuite/tests/h98/ctxsimpl/all.T

+
+include ($confdir ++ "/../singlefile-macros.T")
+
+test "ok1" {
+   expect pass
+   pretest_cleanup()
+   $res = simple_compile_Main()
+   pass when contents(qualify("comp.stdout")) == ""
+   fail when otherwise
+}
+
+
+test "bad1" {
+   expect pass
+   pretest_cleanup()
+   $res = simple_compile_Main()
+   pass when 
+      $tool contains "ghc"
+      && contents(qualify("comp.stdout")) contains "Could not deduce"
+   pass when 
+      $tool contains "nhc"
+      && contents(qualify("comp.stdout")) contains "Couldn't simplify the context"
+   fail when otherwise
+}

testsuite/tests/h98/ctxsimpl/bad1.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-$res = simple_compile_Main()
-
-pass when 
-   $tool contains "ghc"
-   && contents("bad1.comp.stdout") contains "Could not deduce"
-
-pass when 
-   $tool contains "nhc"
-   && contents("bad1.comp.stdout") contains "Couldn't simplify the context"
-
-fail when otherwise

testsuite/tests/h98/ctxsimpl/ok1.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-$res = simple_compile_Main()
-pass when contents("ok1.comp.stdout") == ""
-
-fail when otherwise

testsuite/tests/h98/fields/all.T

+
+include ($confdir ++ "/../singlefile-macros.T")
+
+test "empty" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) == "True\n"
+   fail when otherwise
+}
+
+test "operator" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout"))
+             == contents(qualify("expected.stdout"))
+   fail when otherwise
+}
+
+test "puns" {
+   expect pass
+   pretest_cleanup()
+   $res = simple_compile_Main()
+   pass when 
+      $tool contains "ghc"
+      && contents(qualify("comp.stdout")) contains "parse error on input"
+   pass when 
+      $tool contains "nhc"
+      && contents(qualify("comp.stdout")) contains "Named field puns"
+   fail when otherwise
+}
+
+test "showread" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}
+
+test "type" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stdout")) 
+             == contents(qualify("expect.stdout"))
+   fail when otherwise
+}

testsuite/tests/h98/fields/empty.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("empty.run.stdout") == "True\n"
-
-fail when otherwise
\ No newline at end of file

testsuite/tests/h98/fields/operator.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("operator.run.stdout") 
-          == contents("operator.expected.stdout")
-
-fail when otherwise
\ No newline at end of file

testsuite/tests/h98/fields/puns.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-$res = simple_compile_Main()
-
-pass when 
-   $tool contains "ghc"
-   && contents("puns.comp.stdout") contains "parse error on input"
-
-pass when 
-   $tool contains "nhc"
-   && contents("puns.comp.stdout") contains "Named field puns"
-
-fail when otherwise

testsuite/tests/h98/fields/showread.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("showread.run.stdout") == contents("showread.expect.stdout")
-
-fail when otherwise
\ No newline at end of file

testsuite/tests/h98/fields/type.T

-
-include ($confdir ++ "/../singlefile-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("type.run.stdout") == contents("type.expect.stdout")
-
-fail when otherwise
\ No newline at end of file

testsuite/tests/h98/float/show.T

 
 include ($confdir ++ "/../singlefile-macros.T")
-expect pass
 
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when contents("show.run.stderr") contains "Prelude.read: no parse"
-
-fail when otherwise
\ No newline at end of file
+test "show" {
+   expect pass
+   pretest_cleanup()
+   simple_build_Main()
+   $res = simple_run_main_no_stdin()
+   pass when contents(qualify("run.stderr")) 
+             contains "Prelude.read: no parse"
+   fail when otherwise
+}

testsuite/tests/h98/identifiers/all.T

+
+include ($confdir ++ "/../singlefile-macros.T")
+
+test "qual" {
+   expect pass
+   pretest_cleanup()
+   $res = simple_compile_Main()
+   pass when contents(qualify("comp.stdout")) == ""
+   fail when otherwise
+}
+
+test "twiddle" {
+   expect pass
+   pretest_cleanup()
+   $res = simple_compile_Main()
+   pass when contents(qualify("comp.stdout")) == ""
+   fail when otherwise
+}
\ No newline at end of file