Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19032/src/testing
Modified Files:
Mtest.py.in README
Log Message:
propagated changes of Monday Feb 11 2008 - Tuesday Feb 12 2008
from the MonetDB_1-22 branch to the development trunk
Index: README
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/README,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- README 8 Oct 2007 09:24:37 -0000 1.44
+++ README 12 Feb 2008 18:47:40 -0000 1.45
@@ -194,21 +194,21 @@
a) overrule the initial setting of MONETDB_SOURCE, MONETDB_BUILD,
and MONETDB_PREFIX which were hardcoded during configure as (e.g.)
MONETDB_SOURCE=~/dev/monet
- MONETDB_BUILD=~/dev/monet/$OSVER
- MONETDB_PREFIX=~/dev/monet/$OSVER
+ MONETDB_BUILD=~/dev/monet/$SYSTVER
+ MONETDB_PREFIX=~/dev/monet/$SYSTVER
by
either setting the respective environment variables (e.g.) as follows
MONETDB_SOURCE=/net/myhost/export/scratch1/myname/monet
- MONETDB_BUILD=/net/myhost/export/scratch1/myname/monet/$OSVER
- MONETDB_PREFIX=/net/myhost/export/scratch1/myname/monet/$OSVER
+ MONETDB_BUILD=/net/myhost/export/scratch1/myname/monet/$SYSTVER
+ MONETDB_PREFIX=/net/myhost/export/scratch1/myname/monet/$SYSTVER
before running Mtest.py
or using the respective command line options to Mtest.py
or
b) overrule the default settings of TSTSRCBASE, TSTBLDBASE, and
TSTTRGBASE (e.g.) as follows
TSTSRCBASE=/net/myhost/export/scratch1/myname/monet
- TSTBLDBASE=/net/myhost/export/scratch1/myname/monet/$OSVER
- TSTTRGBASE=/net/myhost/export/scratch1/myname/monet/$OSVER
+ TSTBLDBASE=/net/myhost/export/scratch1/myname/monet/$SYSTVER
+ TSTTRGBASE=/net/myhost/export/scratch1/myname/monet/$SYSTVER
either by setting the repective environment variables
or by using the respective command line options to Mtest.py (see
above).
@@ -266,8 +266,8 @@
name description
---- -----------
HOST hostname
- OS `uname`
- OSVER `uname``uname -r`
+ SYST `uname`
+ SYSTVER `uname``uname -r`
MTIMEOUT "Mtimeout -timeout $TIMEOUT"
MDIFF "$MTIMEOUT Mdiff"
MSERVER "$MTIMEOUT Mserver --config=$MONETDB_CONF
--debug=$GDK_DEBUG $setMONETDB_MOD_PATH $setGDK_DBFARM $setSQL_LOGDIR
$setXQUERY_LOGDIR --set mapi_port=$MAPIPORT --set xrpc_port=$XRPCPORT --set
monet_prompt= --trace"
@@ -315,7 +315,7 @@
- Mtest.py stores the output of test "$TSTSRCDIR/TST" in
$TSTTRGDIR/TST.test.{out,err} and checks it against
$TSTSRCDIR/TST.stable.{out,err}. If system specific stable output files
-
($TSTSRCDIR/TST.stable.{out,err}[.($OS|$OSVER)][.(64|32)bit][.oid(32|64)][.Five][.STATIC])
+
($TSTSRCDIR/TST.stable.{out,err}[.($SYST|$SYSTVER)][.(64|32)bit][.oid(32|64)][.Five][.STATIC])
exist, the most specific stable output is used. Mtest.py stores the
respective Mdiff results in $TSTTRGDIR/TST.{out,err}.diff.html.
For each test directory, a common entry point to the test results is
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- Mtest.py.in 30 Jan 2008 19:40:44 -0000 1.337
+++ Mtest.py.in 12 Feb 2008 18:47:40 -0000 1.338
@@ -1049,7 +1049,7 @@
w = 0
else: # WHAT == 'err'
w = 1
- stableOUTPUT =
TSTSRCDIRTST+StableOutErr(env,par,TSTSRCDIRTST,OS,RELEASE,DIST,VERSION)[w]
+ stableOUTPUT =
TSTSRCDIRTST+StableOutErr(env,par,TSTSRCDIRTST,SYST,RELEASE,DIST,VERSION)[w]
SYSTEM = stableOUTPUT.split(WHAT)[-1]
if os.path.isfile(testOUTPUT):
@@ -1367,7 +1367,7 @@
def StopAt(ATJOB,ME) :
while os.path.isfile(path("/tmp/.MkillUsers."+ME)):
time.sleep(9)
- if OS == "IRIX" or OS == "IRIX64":
+ if SYST == "IRIX" or SYST == "IRIX64":
ATRM = 'at -r '
else:
ATRM = 'atrm '
@@ -1376,7 +1376,7 @@
#LOG1x at -l >&2
### StopAt(ATJOB,ME) #
-def StableOutErr(env,par,TST,OS,RELEASE,DIST,VERSION) :
+def StableOutErr(env,par,TST,SYST,RELEASE,DIST,VERSION) :
BITS = env['TST_BITS']
OIDS = env['TST_OIDS']
FIVE = env['TST_FIVE']
@@ -1389,7 +1389,7 @@
if ALGEBRA:
ALGEBRA = "(\.Algebra)?"
dir,file = os.path.split(TST)
- outre =
re.compile('^'+re.escape(file)+'\.stable\.(?P<tp>out|err)(\.(%s(%s)?|%s(%s)?))?(\.%s)?(\.%s)?%s%s%s$'
% (re.escape(OS), re.escape(RELEASE), re.escape(DIST), re.escape(VERSION),
BITS, OIDS, FIVE, STATIC, ALGEBRA))
+ outre =
re.compile('^'+re.escape(file)+'\.stable\.(?P<tp>out|err)(\.(%s(%s)?|%s(%s)?))?(\.%s)?(\.%s)?%s%s%s$'
% (re.escape(SYST), re.escape(RELEASE), re.escape(DIST), re.escape(VERSION),
BITS, OIDS, FIVE, STATIC, ALGEBRA))
bestout = besterr = ''
for f in os.listdir(dir or os.curdir):
res = outre.match(f)
@@ -1409,7 +1409,7 @@
else:
STABLEerr = '.stable.err'
return STABLEout, STABLEerr
-### StableOutErr(env,par,TST,OS,RELEASE,DIST,VERSION) #
+### StableOutErr(env,par,TST,SYST,RELEASE,DIST,VERSION) #
def RunTest(env, TST, BusyPorts, COND) :
Failed = F_SKIP
@@ -1627,7 +1627,7 @@
ACCURACYout = par['ACCURACY']
ACCURACYerr = par['ACCURACY']
- STABLEout,STABLEerr = StableOutErr(env,par,TST,OS,RELEASE,DIST,VERSION)
+ STABLEout,STABLEerr =
StableOutErr(env,par,TST,SYST,RELEASE,DIST,VERSION)
if not os.path.isfile(TST+STABLEout):
open(TST+STABLEout,"w").close()
ACCURACYout = 0
@@ -2539,7 +2539,7 @@
def ReadMapproveRc(f) :
v = {}
- v['OS'] = OS
+ v['SYST'] = SYST
v['RELEASE'] = RELEASE
v['DIST'] = DIST
v['VERSION'] = VERSION
@@ -2590,7 +2590,7 @@
os.environ['HOST'] = HOST
if os.name == "nt":
- OS = "Windows"
+ SYST = "Windows"
RELEASE = "5.0"
r = re.compile('^Microsoft Windows (.*)\[Version
([0-9]+\.[0-9]+)([^\[0-9].*)\]$')
proc = subprocess.Popen('cmd /c ver', stdin = subprocess.PIPE, stdout =
subprocess.PIPE, universal_newlines = True)
@@ -2600,19 +2600,19 @@
if m and m.group(2):
RELEASE = m.group(2)
else:
- OS = os.uname()[0].split("_NT-", 1)[0]
- if OS == "AIX":
+ SYST = os.uname()[0].split("_NT-", 1)[0]
+ if SYST == "AIX":
RELEASE = os.uname()[3]+"."+os.uname()[2]
else:
RELEASE = os.uname()[2].split("(", 1)[0]
# this is for the wine/mingw setup
if sys.platform == 'linux2' and CONDITIONALS['CROSS_COMPILING']:
- OS = 'Windows'
+ SYST = 'Windows'
HOST = "WINE"
RELEASE = "5.2"
-if OS == "Linux":
+if SYST == "Linux":
# Please keep this aligned / in sync with buildtools/conf/MonetDB.m4 &
TestTools/.Mconfig.rc & TestTools/MdoServer !
LINUX_DIST=''
if os.path.isfile('/etc/fedora-release'):
@@ -2666,16 +2666,16 @@
elif os.path.isfile('/etc/debian_version'):
LINUX_DIST = "Debian:"+open('/etc/debian_version').readline().strip()
if not LINUX_DIST:
- LINUX_DIST =
OS+':'+re.compile('^([0-9\.]*)([^0-9\.].*)$').match(RELEASE).group(1)
+ LINUX_DIST =
SYST+':'+re.compile('^([0-9\.]*)([^0-9\.].*)$').match(RELEASE).group(1)
DIST,VERSION = LINUX_DIST.split(':', 1)
else:
- DIST = OS
+ DIST = SYST
VERSION = RELEASE
-OSVER = OS+RELEASE
+SYSTVER = SYST+RELEASE
DISTVER = DIST+VERSION
-os.environ['OS'] = OS
-os.environ['OSVER'] = OSVER
+os.environ['SYST'] = SYST
+os.environ['SYSTVER'] = SYSTVER
os.environ['RELEASE'] = RELEASE
os.environ['DIST'] = DIST
os.environ['DISTVER'] = DISTVER
@@ -2899,9 +2899,9 @@
"(default: <ext> = 'out' & 'err')"),
(None, 'S', 'sys', '<sys>',
"approve specific output *.<ext><sys>\n"
- "(<sys> =
'[.(<OS>[<RELEASE>]|<DIST>[<VERSION>])][.(32|64)bit][.oid(32|64)][.Five][.STATIC][.Algebra]',\n"
+ "(<sys> =
'[.(<SYST>[<RELEASE>]|<DIST>[<VERSION>])][.(32|64)bit][.oid(32|64)][.Five][.STATIC][.Algebra]',\n"
"(default: longest match for <sys> =
'[.(%s[%s]|%s[%s])]%s%s%s%s%s')"
- % (v['OS'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['OIDS'], v['FIVE'], v['STATIC'], v['ALGEBRA'])),
+ % (v['SYST'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['OIDS'], v['FIVE'], v['STATIC'], v['ALGEBRA'])),
(None, 'f', 'force', None,
"force approval of error messages (i.e., lines starting with
'!')"),
]
@@ -3153,20 +3153,20 @@
if THISFILE == 'Mapprove.py':
f = os.path.join(env['TSTTRGBASE'],TSTPREF,'.Mapprove.rc')
v = ReadMapproveRc(f)
- OS = v['OS']
+ SYST = v['SYST']
RELEASE = v['RELEASE']
- OSVER = OS+RELEASE
+ SYSTVER = SYST+RELEASE
DIST = v['DIST']
VERSION = v['VERSION']
DISTVER = DIST+VERSION
- os.environ['OS'] = OS
- os.environ['OSVER'] = OSVER
+ os.environ['SYST'] = SYST
+ os.environ['SYSTVER'] = SYSTVER
os.environ['RELEASE'] = RELEASE
os.environ['DIST'] = DIST
os.environ['DISTVER'] = DISTVER
os.environ['VERSION'] = VERSION
w = {}
- for i in 'OS', 'RELEASE', 'DIST', 'VERSION', 'BITS', 'OIDS', 'FIVE',
'STATIC', 'ALGEBRA':
+ for i in 'SYST', 'RELEASE', 'DIST', 'VERSION', 'BITS', 'OIDS', 'FIVE',
'STATIC', 'ALGEBRA':
w[i] = re.escape(v[i])
for i in 'BITS', 'OIDS', 'FIVE', 'STATIC', 'ALGEBRA':
j = 'TST_'+i
@@ -3175,8 +3175,8 @@
if v[i]:
v[i] = '(.%s)?' % v[i]
w[i] = '(\.%s)?' % w[i]
- sv = '^(.(%s(%s)?|%s(%s)?))?%s%s%s%s%s$' % (v['OS'], v['RELEASE'],
v['DIST'], v['VERSION'], v['BITS'], v['OIDS'], v['FIVE'], v['STATIC'],
v['ALGEBRA'])
- sw = '^(\.(%s(%s)?|%s(%s)?))?%s%s%s%s%s$' % (w['OS'], w['RELEASE'],
w['DIST'], w['VERSION'], w['BITS'], w['OIDS'], w['FIVE'], w['STATIC'],
w['ALGEBRA'])
+ sv = '^(.(%s(%s)?|%s(%s)?))?%s%s%s%s%s$' % (v['SYST'], v['RELEASE'],
v['DIST'], v['VERSION'], v['BITS'], v['OIDS'], v['FIVE'], v['STATIC'],
v['ALGEBRA'])
+ sw = '^(\.(%s(%s)?|%s(%s)?))?%s%s%s%s%s$' % (w['SYST'], w['RELEASE'],
w['DIST'], w['VERSION'], w['BITS'], w['OIDS'], w['FIVE'], w['STATIC'],
w['ALGEBRA'])
r = re.compile(sw)
if not r.match(par['SYSTEM']):
ErrXit("System (-S) must match '"+sv+"' !")
@@ -3540,13 +3540,13 @@
BusyPorts.append(SRVR)
# create '.Mapprove.rc'
- env['OS'] = os.environ['OS']
+ env['SYST'] = os.environ['SYST']
env['RELEASE'] = os.environ['RELEASE']
env['DIST'] = os.environ['DIST']
env['VERSION'] = os.environ['VERSION']
n = os.path.join(env['TSTTRGBASE'],TSTPREF,'.Mapprove.rc')
f = open(n, 'w')
- for v in 'OS', 'RELEASE', 'DIST', 'VERSION', 'TST_BITS', 'TST_OIDS',
'TST_FIVE', 'TST_STATIC', 'TST_ALGEBRA':
+ for v in 'SYST', 'RELEASE', 'DIST', 'VERSION', 'TST_BITS', 'TST_OIDS',
'TST_FIVE', 'TST_STATIC', 'TST_ALGEBRA':
w = v.replace('TST_','')
f.write('%s = "%s"\n' % (w, env[v]))
f.close()
@@ -3653,7 +3653,7 @@
'%s', '%s', %s, %s, %s,
'%s', '%s', '%s',
%s, '%s', '%s');
-""" %(now, host, env['OS'], env['RELEASE'],
+""" %(now, host, env['SYST'], env['RELEASE'],
ccname, ccopts, bits, oids, isStatic,
product, TSTDIR, TST,
tms, Fcodes[FtOut], Fcodes[FtErr])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
