Changeset: 050e82d8d088 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=050e82d8d088
Added Files:
sql/benchmarks/ATIS/Tests/load.options5
sql/benchmarks/arno/Tests/insert_ATOM.options5
sql/benchmarks/arno/Tests/insert_BOND.options5
sql/benchmarks/arno_flt/Tests/doAll.options5
sql/benchmarks/arno_flt/Tests/doAll_sorted.options5
sql/benchmarks/arno_flt/Tests/init.options5
sql/benchmarks/moa/Tests/load.options5
Removed Files:
sql/benchmarks/ATIS/Tests/load.prologue5
sql/benchmarks/arno/Tests/insert_ATOM.prologue5
sql/benchmarks/arno/Tests/insert_BOND.prologue5
sql/benchmarks/arno_flt/Tests/doAll.prologue5
sql/benchmarks/arno_flt/Tests/doAll_sorted.prologue5
sql/benchmarks/arno_flt/Tests/init.prologue5
sql/benchmarks/moa/Tests/load.prologue5
Modified Files:
testing/Mtest.py.in
testing/README
Branch: default
Log Message:
Remove support for .prelude5, .prologue5 and .conf files in testing.
Some of those were not used, and what's left can be done using .options5.
diffs (280 lines):
diff --git a/sql/benchmarks/ATIS/Tests/load.options5
b/sql/benchmarks/ATIS/Tests/load.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ATIS/Tests/load.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/ATIS/Tests/load.prologue5
b/sql/benchmarks/ATIS/Tests/load.prologue5
deleted file mode 100644
--- a/sql/benchmarks/ATIS/Tests/load.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/sql/benchmarks/arno/Tests/insert_ATOM.options5
b/sql/benchmarks/arno/Tests/insert_ATOM.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/arno/Tests/insert_ATOM.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/arno/Tests/insert_ATOM.prologue5
b/sql/benchmarks/arno/Tests/insert_ATOM.prologue5
deleted file mode 100644
--- a/sql/benchmarks/arno/Tests/insert_ATOM.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/sql/benchmarks/arno/Tests/insert_BOND.options5
b/sql/benchmarks/arno/Tests/insert_BOND.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/arno/Tests/insert_BOND.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/arno/Tests/insert_BOND.prologue5
b/sql/benchmarks/arno/Tests/insert_BOND.prologue5
deleted file mode 100644
--- a/sql/benchmarks/arno/Tests/insert_BOND.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/sql/benchmarks/arno_flt/Tests/doAll.options5
b/sql/benchmarks/arno_flt/Tests/doAll.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/arno_flt/Tests/doAll.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/arno_flt/Tests/doAll.prologue5
b/sql/benchmarks/arno_flt/Tests/doAll.prologue5
deleted file mode 100644
--- a/sql/benchmarks/arno_flt/Tests/doAll.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/sql/benchmarks/arno_flt/Tests/doAll_sorted.options5
b/sql/benchmarks/arno_flt/Tests/doAll_sorted.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/arno_flt/Tests/doAll_sorted.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/arno_flt/Tests/doAll_sorted.prologue5
b/sql/benchmarks/arno_flt/Tests/doAll_sorted.prologue5
deleted file mode 100644
--- a/sql/benchmarks/arno_flt/Tests/doAll_sorted.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/sql/benchmarks/arno_flt/Tests/init.options5
b/sql/benchmarks/arno_flt/Tests/init.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/arno_flt/Tests/init.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/arno_flt/Tests/init.prologue5
b/sql/benchmarks/arno_flt/Tests/init.prologue5
deleted file mode 100644
--- a/sql/benchmarks/arno_flt/Tests/init.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/sql/benchmarks/moa/Tests/load.options5
b/sql/benchmarks/moa/Tests/load.options5
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/moa/Tests/load.options5
@@ -0,0 +1,1 @@
+-d0
diff --git a/sql/benchmarks/moa/Tests/load.prologue5
b/sql/benchmarks/moa/Tests/load.prologue5
deleted file mode 100644
--- a/sql/benchmarks/moa/Tests/load.prologue5
+++ /dev/null
@@ -1,6 +0,0 @@
-INT_MAX := 2147483647;
-dbgmsk := mdb.getDebug();
-unset := 8+8388608;
-keep := calc.xor(INT_MAX,unset);
-set := calc.and(dbgmsk,keep);
-mdb.setDebug(set);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2245,11 +2245,6 @@ def RunTest(env, TST, BusyPorts, COND, o
elem = SkipTest(env, TST, EXT, reason, length)
return TX,Failed,Failed,elem,reason,links
- PRELUDE = []
- if EXT != '.sql':
- if os.path.isfile(TST+".prelude5"):
- PRELUDE = [TST+".prelude5"]
-
TIMEOUT = par['TIMEOUT']
if os.path.isfile(TST+".timeout"):
for f in openutf8(TST+".timeout"):
@@ -2288,7 +2283,7 @@ def RunTest(env, TST, BusyPorts, COND, o
TestErr.close()
t0 = time.time()
- tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile,
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito,
threads, user, passwd, COND, all_tests)
+ tres = DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, threads, user,
passwd, COND, all_tests)
t1 = time.time()
TX = t1 - t0
@@ -3013,15 +3008,15 @@ def mapi_ping(port) :
return False
### mapi_ping() #
-def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, threads, user,
passwd, COND, all_tests) :
+def DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile, STIMEOUT,
CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, threads, user, passwd,
COND, all_tests) :
ATJOB2 = ""
STDERR.flush()
if quiet:
STDOUT.write(".")
elif verbose:
- STDOUT.write('%s%s %s (<=%d,%d,%d) ...' %
+ STDOUT.write('%s%s (<=%d,%d,%d) ...' %
(prompt(), os.path.join(env['TSTDIR'], TST + EXT),
- PRELUDE and PRELUDE[0] or '', TIMEOUT, CTIMEOUT,
STIMEOUT))
+ TIMEOUT, CTIMEOUT, STIMEOUT))
else:
if ttywidth > 0 and length + 10 + 21 >= ttywidth:
# 10 - length of prompt()
@@ -3045,13 +3040,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
TSTDB = env['TSTDB']
exe = env['exe']
- if os.path.isfile(TST+".conf"):
- LOCAL_CONF = ['--config=%s.conf' % TST ]
- elif os.path.isfile(os.path.join(env['TSTSRCDIR'],"All.conf")):
- LOCAL_CONF = ['--config=%s' %
os.path.join(env['TSTSRCDIR'],"All.conf")]
- else:
- LOCAL_CONF = []
-
# Release reserved sockets and run the actual test
MAPIsockets[0].close()
MAPIsockets[1].close()
@@ -3068,11 +3056,8 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
ClntErrFile = TST+".client.err"
ClntOut = openutf8(ClntOutFile,"w")
ClntErr = openutf8(ClntErrFile,"w")
- PROLOGUE = []
- if os.path.isfile(TST + ".prologue5"):
- PROLOGUE = [TST + ".prologue5"]
-
- Srvr = splitcommand(exe['mserver5'][1]) + LOCAL_CONF
+
+ Srvr = splitcommand(exe['mserver5'][1])
if nomito:
try:
Srvr.remove('--forcemito')
@@ -3098,7 +3083,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
lang="mal"
if SERVER == "SQL":
lang="sql"
- Srvr.extend(PROLOGUE)
# enable r integration in server
if (not all_tests or (COND != None and "HAVE_LIBR" in COND)) and
CONDITIONALS['HAVE_LIBR'] and CONDITIONALS['NOT_WIN32']:
@@ -3165,10 +3149,10 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
if SERVER not in ["MAL", "SQL"] or pSrvr.started:
if CALL == "other":
- cmd = [os.path.join(".", TST + EXT), TST] + PRELUDE
+ cmd = [os.path.join(".", TST + EXT), TST]
returncode = RunIt(cmd, False, "", ClntOut, ClntErr, CTIMEOUT)
elif CALL == "python":
- cmd = splitcommand(exe['python'][1]) + [TST + EXT, TST] +
PRELUDE
+ cmd = splitcommand(exe['python'][1]) + [TST + EXT, TST]
returncode = RunIt(cmd, False, "", ClntOut, ClntErr, CTIMEOUT)
elif CALL in ["mal", "malXs"]:
TSTs = []
@@ -3312,7 +3296,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
return None
-### DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito) #
+### DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile, STIMEOUT,
CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito) #
def Check(command, input) :
global setpgrp
@@ -3805,10 +3789,6 @@ def main(argv) :
except monet_options.Error:
sys.exit(1)
- config = opts.get('config', '')
- if config:
- config = ' "--config=%s"' % config
-
recursive = opts.get('recursive', False)
global testweb
testweb = opts.get('testweb', False)
@@ -4233,8 +4213,8 @@ def main(argv) :
SOCK = ""
exe = {}
- exe['mserver5'] = CheckExec('mserver5') , '%s mserver5
%s --debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set
mapi_port=%s %s %s %s' % \
-
(env['setDBG'], config, env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, not nomito and '--forcemito'
or '', env['MSERVER_SET'])
+ exe['mserver5'] = CheckExec('mserver5') , '%s mserver5
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%s
%s %s %s' % \
+
(env['setDBG'], env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, not nomito and '--forcemito'
or '', env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
exe['ruby_client'] = CheckExec(env['RUBYCLIENT'].split(None,
1)[0]) , '%s %s' % (env['RUBYCLIENT'], env['MAPIPORT'])
diff --git a/testing/README b/testing/README
--- a/testing/README
+++ b/testing/README
@@ -60,15 +60,9 @@ http://monetdb.cwi.nl/Development/TestWe
TST.*.in exists instead of TST.*, all environment variables in
TST.*.in are replaced by their current value
when copying $TSTSRCDIR/TST.*.in to $TSTTRGDIR/TST.* .
- + a MAL script to be used as prelude for mserver5
- (optional) (TST.prelude5)
(4,5)
+ for frontend tests with MonetDB5 (mserver5), extra options with
which mserver5 is started
(optional) (TST.options5)
(4,5)
- + for mclient tests, a MAL script to be used as
- prologue for mserver5, i.e., a script that is executed by mserver5
- before (the first) mclient connects to mserver5
- (optional)
(TST.prologue5)(4,5)
+ a file that contains a list of modules (one per line)
required by the test (optional) (TST.modules)
(4,5)
+ a file that contains a list of tests (one per line) that must
@@ -90,14 +84,13 @@ http://monetdb.cwi.nl/Development/TestWe
Using this naming conventions, the test environment can automatically
decide what to do when called as "Mtest.py TST" (see below), i.e. execute
one of the following:
- * TST[.sh|.exe|.com|.bat|.cmd] TST [TST.prelude]
- * python TST.py [TST.prelude]
- * mserver5 --dbpath=GDK_DBFARM/TSTDB [TST.prelude] < TST.mal
- * mserver5 --dbpath=GDK_DBFARM/TSTDB --set mapi_port=$MAPIPORT --set
xrpc_port=$XRPCPORT "[<TST.options5]" [TST.prologue5] &
+ * TST[.sh|.exe|.com|.bat|.cmd] TST
+ * python TST.py
+ * mserver5 --dbpath=GDK_DBFARM/TSTDB --set mapi_port=$MAPIPORT
"[<TST.options5]" &
mclient -lmal < TST[_(s|p)XX].malC
or TST.MAL.(sh|exe|com|bat|cmd) TST
or python TST.MAL.py
- * mserver5 --dbpath=GDK_DBFARM/TSTDB --set mapi_port=$MAPIPORT --set
xrpc_port=$XRPCPORT "[<TST.options5]" [TST.prologue5] &
+ * mserver5 --dbpath=GDK_DBFARM/TSTDB --set mapi_port=$MAPIPORT
"[<TST.options5]" &
mclient -lsql < TST[_(s|p)XX].sql
or TST.SQL.(sh|exe|com|bat|cmd) TST
or python TST..SQL.py
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
