Commit 771cb568 authored by sewardj's avatar sewardj

[project @ 2001-07-11 16:07:52 by sewardj]

Rename some functions used in vanilla-test.T to be more consistent/logical.
parent 3b5b9175
......@@ -244,9 +244,9 @@ def check_stderr_ok()
-- Compile and run (should_run) style test
def vanilla-test-actions ( $extra_compile_args,
$extra_run_args,
$allowable_nonzero_exit_code )
def vanilla-run-test-actions ( $extra_compile_args,
$extra_run_args,
$allowable_nonzero_exit_code )
{
pretest_cleanup()
simple_build_Main( $extra_compile_args )
......@@ -265,7 +265,7 @@ def vanilla-test-actions ( $extra_compile_args,
-- succeeded if the compiler returned zero AND (testname.comp.stderr
-- matches testname.stderr, if it exists, or is empty).
def vanilla-comp-test-actions ( $extra_compile_args )
def vanilla-compok-test-actions ( $extra_compile_args )
{
pretest_cleanup()
$res = simple_build_Main_WRK ( $extra_compile_args, True )
......@@ -344,14 +344,14 @@ def vanilla-compfail-test-actions ( $extra_compile_args )
-- top-level
-- Compile and run (should_run) style test
def vt ( $extra_compile_args,
$extra_run_args,
$allowable_nonzero_exit_code )
def vtr ( $extra_compile_args,
$extra_run_args,
$allowable_nonzero_exit_code )
{
$test_passed
= vanilla-test-actions ( $extra_compile_args,
$extra_run_args,
$allowable_nonzero_exit_code )
= vanilla-run-test-actions ( $extra_compile_args,
$extra_run_args,
$allowable_nonzero_exit_code )
expect pass
pass when $test_passed
fail when otherwise
......@@ -363,7 +363,7 @@ def vt ( $extra_compile_args,
def vtc ( $extra_compile_args )
{
$test_passed
= vanilla-comp-test-actions ( $extra_compile_args )
= vanilla-compok-test-actions ( $extra_compile_args )
expect pass
pass when $test_passed
fail when otherwise
......@@ -372,7 +372,7 @@ def vtc ( $extra_compile_args )
-- Compile only, and expect failure (should_fail) style test
def vtf ( $extra_compile_args )
def vtcf ( $extra_compile_args )
{
$test_passed
= vanilla-compfail-test-actions ( $extra_compile_args )
......
......@@ -27,4 +27,8 @@ simpleCore/should_compile
deSugar/should_compile
cvh-ds-unboxed/ not done
specialise/
none of these are run in the old framework, so not included
in new.
......@@ -5,19 +5,19 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "arr001" { vt("", "", "") }
test "arr002" { vt("", "", "") }
test "arr003" { vt("", "", "1") }
test "arr004" { vt("", "", "1") }
test "arr005" { vt("", "", "") }
test "arr006" { vt("", "", "") }
test "arr007" { vt("", "", "7") }
test "arr008" { vt("", "", "8") }
test "arr009" { vt("", "", "") }
test "arr010" { vt("", "", "") }
test "arr011" { vt("", "", "") }
test "arr012" { vt("", "", "") }
test "arr013" { vt("", "", "") }
test "arr014" { vt("-package lang", "", "") }
test "arr015" { vt("", "", "") }
test "arr016" { vt("-fglasgow-exts", "", "") }
test "arr001" { vtr("", "", "") }
test "arr002" { vtr("", "", "") }
test "arr003" { vtr("", "", "1") }
test "arr004" { vtr("", "", "1") }
test "arr005" { vtr("", "", "") }
test "arr006" { vtr("", "", "") }
test "arr007" { vtr("", "", "7") }
test "arr008" { vtr("", "", "8") }
test "arr009" { vtr("", "", "") }
test "arr010" { vtr("", "", "") }
test "arr011" { vtr("", "", "") }
test "arr012" { vtr("", "", "") }
test "arr013" { vtr("", "", "") }
test "arr014" { vtr("-package lang", "", "") }
test "arr015" { vtr("", "", "") }
test "arr016" { vtr("-fglasgow-exts", "", "") }
include ($confdir ++ "/../vanilla-test.T")
-- Args to vtf are: extra compile flags
-- Args to vtcf are: extra compile flags
def myvtf ( $args )
def myvtcf ( $args )
{
vtf ( " -package lang " ++ $args)
vtcf ( " -package lang " ++ $args)
}
test "cc001" { myvtf("") }
test "cc002" { myvtf("") }
test "cc004" { myvtf("") }
test "cc005" { myvtf("") }
test "cc001" { myvtcf("") }
test "cc002" { myvtcf("") }
test "cc004" { myvtcf("") }
test "cc005" { myvtcf("") }
......@@ -5,9 +5,9 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "callback" { vt("-fglasgow-exts -package lang -fvia-C callback_stub.o",
test "callback" { vtr("-fglasgow-exts -package lang -fvia-C callback_stub.o",
"", "") }
test "fed001" { vt("-fglasgow-exts -package lang",
test "fed001" { vtr("-fglasgow-exts -package lang",
"", "") }
test "ffi001" { vt("-fglasgow-exts -package lang",
test "ffi001" { vtr("-fglasgow-exts -package lang",
"", "") }
......@@ -5,54 +5,54 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "cg001" { vt("", "", "") }
test "cg002" { vt("", "", "") }
test "cg003" { vt("", "", "") }
test "cg004" { vt("", "", "") }
test "cg005" { vt("", "", "") }
test "cg006" { vt("", "", "") }
test "cg007" { vt("", "", "") }
test "cg008" { vt("", "", "") }
test "cg009" { vt("", "", "") }
test "cg010" { vt("", "", "") }
test "cg011" { vt("", "", "") }
test "cg012" { vt("-fglasgow-exts", "", "") }
test "cg013" { vt("", "", "") }
test "cg014" { vt("", "", "") }
test "cg015" { vt("-fglasgow-exts", "", "") }
test "cg016" { vt("", "", "1") }
test "cg017" { vt("", "", "") }
test "cg018" { vt("-fglasgow-exts", "", "") }
test "cg019" { vt("", "", "") }
test "cg020" { vt("", "", "") }
test "cg021" { vt("", "", "") }
test "cg022" { vt("", "", "") }
test "cg023" { vt("", "", "") }
test "cg024" { vt("", "", "") }
test "cg025" { vt("-package lang -package text", "", "1") }
test "cg026" { vt("-package lang -fglasgow-exts -fvia-C", "", "") }
test "cg027" { vt("", "", "") }
test "cg028" { vt("", "", "") }
test "cg029" { vt("-package lang -fglasgow-exts", "", "") }
test "cg030" { vt("-package lang -fglasgow-exts", "", "") }
test "cg031" { vt("-fglasgow-exts", "", "") }
test "cg032" { vt("-fglasgow-exts", "", "") }
test "cg033" { vt("-fglasgow-exts", "", "") }
test "cg034" { vt("", "", "") }
test "cg035" { vt("-package lang -fglasgow-exts", "", "") }
test "cg036" { vt("", "", "") }
test "cg037" { vt("", "", "") }
test "cg038" { vt("", "", "") }
test "cg039" { vt("", "", "") }
test "cg040" { vt("", "", "") }
test "cg041" { vt("", "", "") }
test "cg042" { vt("-package lang -fglasgow-exts", "", "") }
test "cg043" { vt("", "", "") }
test "cg044" { vt("-package lang", "", "" ) }
test "cg001" { vtr("", "", "") }
test "cg002" { vtr("", "", "") }
test "cg003" { vtr("", "", "") }
test "cg004" { vtr("", "", "") }
test "cg005" { vtr("", "", "") }
test "cg006" { vtr("", "", "") }
test "cg007" { vtr("", "", "") }
test "cg008" { vtr("", "", "") }
test "cg009" { vtr("", "", "") }
test "cg010" { vtr("", "", "") }
test "cg011" { vtr("", "", "") }
test "cg012" { vtr("-fglasgow-exts", "", "") }
test "cg013" { vtr("", "", "") }
test "cg014" { vtr("", "", "") }
test "cg015" { vtr("-fglasgow-exts", "", "") }
test "cg016" { vtr("", "", "1") }
test "cg017" { vtr("", "", "") }
test "cg018" { vtr("-fglasgow-exts", "", "") }
test "cg019" { vtr("", "", "") }
test "cg020" { vtr("", "", "") }
test "cg021" { vtr("", "", "") }
test "cg022" { vtr("", "", "") }
test "cg023" { vtr("", "", "") }
test "cg024" { vtr("", "", "") }
test "cg025" { vtr("-package lang -package text", "", "1") }
test "cg026" { vtr("-package lang -fglasgow-exts -fvia-C", "", "") }
test "cg027" { vtr("", "", "") }
test "cg028" { vtr("", "", "") }
test "cg029" { vtr("-package lang -fglasgow-exts", "", "") }
test "cg030" { vtr("-package lang -fglasgow-exts", "", "") }
test "cg031" { vtr("-fglasgow-exts", "", "") }
test "cg032" { vtr("-fglasgow-exts", "", "") }
test "cg033" { vtr("-fglasgow-exts", "", "") }
test "cg034" { vtr("", "", "") }
test "cg035" { vtr("-package lang -fglasgow-exts", "", "") }
test "cg036" { vtr("", "", "") }
test "cg037" { vtr("", "", "") }
test "cg038" { vtr("", "", "") }
test "cg039" { vtr("", "", "") }
test "cg040" { vtr("", "", "") }
test "cg041" { vtr("", "", "") }
test "cg042" { vtr("-package lang -fglasgow-exts", "", "") }
test "cg043" { vtr("", "", "") }
test "cg044" { vtr("-package lang", "", "" ) }
-- tmp, until we fix the problems with seq#...
test "cg045" { vt( "-O", "", "1") }
test "cg046" { vt("", "", "") }
test "cg047" { vt("", "", "") }
test "cg048" { vt("", "", "") }
test "cg049" { vt( "-funbox-strict-fields", "", "") }
test "cg045" { vtr( "-O", "", "1") }
test "cg046" { vtr("", "", "") }
test "cg047" { vtr("", "", "") }
test "cg048" { vtr("", "", "") }
test "cg049" { vtr( "-funbox-strict-fields", "", "") }
......@@ -14,39 +14,39 @@ def myvt ( $args_c, $args_r, $ret_res )
--conc009_RUNTEST_OPTS = -x 1
--conc021_RUNTEST_OPTS = -x 250 -o2 conc021.stderr-mingw
test "conc001" { myvt("", "", "") }
test "conc002" { myvt("", "", "") }
test "conc003" { myvt("", "", "") }
test "conc004" { myvt("", "", "") }
test "conc005" { myvt("", "", "") }
test "conc006" { myvt("", "", "") }
test "conc007" { myvt("", "+RTS -H128M -RTS", "") }
test "conc008" { myvt("", "", "") }
test "conc009" { myvt("", "", "") }
test "conc010" { myvt("", "", "") }
test "conc012" { myvt("", "", "") }
test "conc013" { myvt("", "", "") }
test "conc014" { myvt("", "", "") }
test "conc015" { myvt("", "", "") }
test "conc016" { myvt("", "", "") }
test "conc017" { myvt("", "", "") }
test "conc018" { myvt("", "", "") }
test "conc019" { myvt("", "", "") }
test "conc001" { myvtr("", "", "") }
test "conc002" { myvtr("", "", "") }
test "conc003" { myvtr("", "", "") }
test "conc004" { myvtr("", "", "") }
test "conc005" { myvtr("", "", "") }
test "conc006" { myvtr("", "", "") }
test "conc007" { myvtr("", "+RTS -H128M -RTS", "") }
test "conc008" { myvtr("", "", "") }
test "conc009" { myvtr("", "", "") }
test "conc010" { myvtr("", "", "") }
test "conc012" { myvtr("", "", "") }
test "conc013" { myvtr("", "", "") }
test "conc014" { myvtr("", "", "") }
test "conc015" { myvtr("", "", "") }
test "conc016" { myvtr("", "", "") }
test "conc017" { myvtr("", "", "") }
test "conc018" { myvtr("", "", "") }
test "conc019" { myvtr("", "", "") }
--# conc020 *should* work on mingw32
test "conc020" { skip when $platform == "i386-unknown-mingw32"
myvt("", "", "") }
myvtr("", "", "") }
test "conc021" { skip when $platform == "i386-unknown-mingw32"
myvt("", "", "") }
test "conc022" { myvt("", "", "") }
test "conc023" { myvt("", "", "") }
test "conc024" { myvt("", "", "") }
test "conc025" { myvt("", "", "") }
test "conc026" { myvt("", "", "") }
test "conc027" { myvt("", "", "") }
test "conc028" { myvt("", "", "") }
test "conc029" { myvt("", "", "") }
test "conc030" { myvt("", "", "") }
test "conc031" { myvt("", "", "") }
myvtr("", "", "") }
test "conc022" { myvtr("", "", "") }
test "conc023" { myvtr("", "", "") }
test "conc024" { myvtr("", "", "") }
test "conc025" { myvtr("", "", "") }
test "conc026" { myvtr("", "", "") }
test "conc027" { myvtr("", "", "") }
test "conc028" { myvtr("", "", "") }
test "conc029" { myvtr("", "", "") }
test "conc030" { myvtr("", "", "") }
test "conc031" { myvtr("", "", "") }
......@@ -5,10 +5,10 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "dsrun001" { vt("", "", "") }
test "dsrun002" { vt("", "", "") }
test "dsrun003" { vt("", "", "") }
test "dsrun004" { vt("", "", "") }
test "dsrun005" { vt("", "", "1") }
test "dsrun006" { vt("", "", "") }
test "dsrun007" { vt("", "", "1") }
test "dsrun001" { vtr("", "", "") }
test "dsrun002" { vtr("", "", "") }
test "dsrun003" { vtr("", "", "") }
test "dsrun004" { vtr("", "", "") }
test "dsrun005" { vtr("", "", "1") }
test "dsrun006" { vtr("", "", "") }
test "dsrun007" { vtr("", "", "1") }
include ($confdir ++ "/../vanilla-test.T")
-- Args to vtf are: extra compile flags
-- Args to vtcf are: extra compile flags
test "drvfail001" { vtf("") }
test "drvfail004" { vtf("") }
test "drvfail007" { vtf("") }
test "drvfail001" { vtcf("") }
test "drvfail004" { vtcf("") }
test "drvfail007" { vtcf("") }
......@@ -5,11 +5,11 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "drvrun001" { vt("", "", "") }
test "drvrun002" { vt("", "", "") }
test "drvrun003" { vt("", "", "") }
test "drvrun004" { vt("", "", "") }
test "drvrun005" { vt("", "-fail", "") }
test "drvrun006" { vt("", "", "") }
test "drvrun007" { vt("", "", "") }
test "drvrun008" { vt("-funbox-strict-fields", "", "") }
test "drvrun001" { vtr("", "", "") }
test "drvrun002" { vtr("", "", "") }
test "drvrun003" { vtr("", "", "") }
test "drvrun004" { vtr("", "", "") }
test "drvrun005" { vtr("", "-fail", "") }
test "drvrun006" { vtr("", "", "") }
test "drvrun007" { vtr("", "", "") }
test "drvrun008" { vtr("-funbox-strict-fields", "", "") }
......@@ -5,27 +5,27 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "arith001" { vt("", "", "") }
test "arith002" { vt("", "", "") }
test "arith003" { vt("", "", "") }
test "arith004" { vt("", "", "") }
test "arith005" { vt("", "", "") }
test "arith006" { vt("-package lang", "", "") }
test "arith007" { vt("", "", "") }
test "arith008" { vt("", "", "") }
test "arith009" { vt("", "", "") }
test "arith010" { vt("-package lang", "", "") }
test "arith011" { vt("-package lang", "", "") }
test "arith012" { vt("-package lang", "", "") }
test "arith013" { vt("", "", "") }
test "num001" { vt("", "", "") }
test "num002" { vt("", "", "") }
test "num003" { vt("", "", "") }
test "num004" { vt("", "", "") }
test "num005" { vt("", "", "") }
test "num006" { vt("-package lang", "", "") }
test "num007" { vt("", "", "") }
test "num008" { vt("", "", "") }
test "num009" { vt("", "", "") }
test "num010" { vt("", "", "") }
test "num011" { vt("", "", "") }
test "arith001" { vtr("", "", "") }
test "arith002" { vtr("", "", "") }
test "arith003" { vtr("", "", "") }
test "arith004" { vtr("", "", "") }
test "arith005" { vtr("", "", "") }
test "arith006" { vtr("-package lang", "", "") }
test "arith007" { vtr("", "", "") }
test "arith008" { vtr("", "", "") }
test "arith009" { vtr("", "", "") }
test "arith010" { vtr("-package lang", "", "") }
test "arith011" { vtr("-package lang", "", "") }
test "arith012" { vtr("-package lang", "", "") }
test "arith013" { vtr("", "", "") }
test "num001" { vtr("", "", "") }
test "num002" { vtr("", "", "") }
test "num003" { vtr("", "", "") }
test "num004" { vtr("", "", "") }
test "num005" { vtr("", "", "") }
test "num006" { vtr("-package lang", "", "") }
test "num007" { vtr("", "", "") }
test "num008" { vtr("", "", "") }
test "num009" { vtr("", "", "") }
test "num010" { vtr("", "", "") }
test "num011" { vtr("", "", "") }
include ($confdir ++ "/../vanilla-test.T")
-- Args to vtf are: extra compile flags
-- Args to vtcf are: extra compile flags
def myvtf ( $extra_compile_args )
def myvtcf ( $extra_compile_args )
{
vtf ( $extra_compile_args ++ " -ddump-parsed ")
vtcf ( $extra_compile_args ++ " -ddump-parsed ")
}
test "read001" { myvtf("") }
test "read002" { myvtf("") }
test "read003" { myvtf("") }
test "read004" { myvtf("") }
test "read005" { myvtf("") }
test "read006" { myvtf("") }
test "read007" { myvtf("") }
test "read008" { myvtf("") }
test "read009" { myvtf("") }
test "read011" { myvtf("") }
test "read012" { myvtf("") }
test "read013" { myvtf("-fglasgow-exts") }
test "read014" { myvtf("") }
test "read015" { myvtf("") }
test "read016" { myvtf("") }
test "read017" { myvtf("") }
test "read001" { myvtcf("") }
test "read002" { myvtcf("") }
test "read003" { myvtcf("") }
test "read004" { myvtcf("") }
test "read005" { myvtcf("") }
test "read006" { myvtcf("") }
test "read007" { myvtcf("") }
test "read008" { myvtcf("") }
test "read009" { myvtcf("") }
test "read011" { myvtcf("") }
test "read012" { myvtcf("") }
test "read013" { myvtcf("-fglasgow-exts") }
test "read014" { myvtcf("") }
test "read015" { myvtcf("") }
test "read016" { myvtcf("") }
test "read017" { myvtcf("") }
include ($confdir ++ "/../vanilla-test.T")
-- Args to vtf are: extra compile flags
-- Args to vtcf are: extra compile flags
test "rnfail001" { vtf("") }
test "rnfail002" { vtf("") }
test "rnfail003" { vtf("") }
test "rnfail004" { vtf("") }
test "rnfail007" { vtf("") }
test "rnfail008" { vtf("") }
test "rnfail009" { vtf("") }
test "rnfail010" { vtf("") }
test "rnfail011" { vtf("") }
test "rnfail012" { vtf("") }
test "rnfail013" { vtf("") }
test "rnfail014" { vtf("") }
test "rnfail015" { vtf("") }
test "rnfail016" { vtf("") }
test "rnfail017" { vtf("") }
test "rnfail018" { vtf("") }
test "rnfail019" { vtf("") }
test "rnfail020" { vtf("") }
test "rnfail021" { vtf("") }
test "rnfail022" { vtf("") }
test "rnfail023" { vtf("") }
test "rnfail024" { vtf("") }
test "rnfail025" { vtf("") }
test "rnfail026" { vtf("") }
test "rnfail027" { vtf("") }
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("") }
......@@ -5,5 +5,5 @@ include ($confdir ++ "/../vanilla-test.T")
-- extra run flags
-- expected process return value, if not zero
test "simplrun001" { vt("-O", "", "") }
test "simplrun002" { vt("-O", "", "") }
test "simplrun001" { vtr("-O", "", "") }
test "simplrun002" { vtr("-O", "", "") }
include ($confdir ++ "/../vanilla-test.T")
-- Args to vtf are: extra compile flags
-- Args to vtcf are: extra compile flags
test "tcfail001" { vtf("") }
test "tcfail002" { vtf("") }
test "tcfail003" { vtf("") }
test "tcfail004" { vtf("") }
test "tcfail005" { vtf("") }
test "tcfail006" { vtf("") }
test "tcfail007" { vtf("") }
test "tcfail008" { vtf("") }
test "tcfail009" { vtf("") }
test "tcfail010" { vtf("") }
test "tcfail011" { vtf("") }
test "tcfail012" { vtf("") }
test "tcfail013" { vtf("") }
test "tcfail014" { vtf("") }
test "tcfail015" { vtf("") }
test "tcfail016" { vtf("") }
test "tcfail017" { vtf("") }
test "tcfail018" { vtf("") }
test "tcfail019" { vtf("") }
test "tcfail020" { vtf("") }
test "tcfail021" { vtf("") }
test "tcfail023" { vtf("") }
test "tcfail027" { vtf("") }
test "tcfail028" { vtf("") }
test "tcfail029" { vtf("") }
test "tcfail030" { vtf("") }
test "tcfail031" { vtf("") }
test "tcfail032" { vtf("") }
test "tcfail033" { vtf("") }
test "tcfail034" { vtf("") }
test "tcfail035" { vtf("") }
test "tcfail036" { vtf("") }
test "tcfail037" { vtf("") }
test "tcfail038" { vtf("") }
test "tcfail039" { vtf("") }
test "tcfail040" { vtf("") }
test "tcfail042" { vtf("") }
test "tcfail043" { vtf("") }
test "tcfail044" { vtf("") }
test "tcfail045" { vtf("-fglasgow-exts -package lang") }
test "tcfail046" { vtf("") }
test "tcfail047" { vtf("") }
test "tcfail048