Changeset: 73a16d1bb968 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/73a16d1bb968
Modified Files:
testing/Mtest.py.in
Branch: Mar2025
Log Message:
Replace strings like $RELSRCDIR in .src test files.
diffs (38 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2076,9 +2076,15 @@ def RunTest(env, TST, COND, oktests, len
if not env.get('NOCLEAN'):
raise
+ myenv = env.copy()
+ myenv['TSTDB'] = TSTDB
+ myenv['TSTDIR'] = TSTDIR
+ myenv['TSTSRCDIR'] = TSTSRCDIR
+ myenv['RELSRCDIR'] = RELSRCDIR
+ myenv['TSTTRGDIR'] = TSTTRGDIR
if os.path.isfile(os.path.join(TSTTRGDIR, TST+EXT+'.src')) and not
os.path.isfile(os.path.join(TSTTRGDIR, TST+EXT)):
with openutf8(os.path.join(TSTTRGDIR, TST+EXT+'.src'),'r') as f:
- TSTSRC = expandvars(path(f.readline().strip()), env)
+ TSTSRC = expandvars(path(f.readline().strip()), myenv)
if os.path.isfile(os.path.join(TSTTRGDIR, TSTSRC)):
try:
SymlinkOrCopy(TSTSRC, TST + EXT, TSTTRGDIR)
@@ -2094,7 +2100,7 @@ def RunTest(env, TST, COND, oktests, len
for ff in listdir(TSTTRGDIR):
if test.match(ff) and not os.path.isfile(os.path.join(TSTTRGDIR,
ff[:-4])):
with openutf8(os.path.join(TSTTRGDIR, ff),'r') as f:
- TSTSRC = expandvars(path(f.readline().strip()), env)
+ TSTSRC = expandvars(path(f.readline().strip()), myenv)
if os.path.isfile(os.path.join(TSTTRGDIR, TSTSRC)):
try:
SymlinkOrCopy(TSTSRC, ff[:-4], TSTTRGDIR)
@@ -2110,7 +2116,7 @@ def RunTest(env, TST, COND, oktests, len
if test.match(ff) and not os.path.isfile(os.path.join(TSTTRGDIR,
fff)) and not ff.endswith('.test.in'):
with openutf8(os.path.join(TSTTRGDIR, fff),'w') as f:
for l in openutf8(os.path.join(TSTTRGDIR, ff)):
- f.write(expandvars(l, env))
+ f.write(expandvars(l, myenv))
if odbc:
with openutf8(os.path.join(TSTTRGDIR, 'odbcinst.ini'), 'w') as f:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
