Changeset: c714de0d15f1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c714de0d15f1
Branch: mtest
Log Message:
merged
diffs (26 lines):
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -661,8 +661,12 @@ def PerformDir(env, testdir, auto=False)
cmd = ['mktest.py', '--database', TSTDB, '--port',
str(pSrvr.port), '--language', CALL]
with process.Popen(cmd, stdin=fin, stdout=process.PIPE,
text=True) as proc:
if auto:
+ is_input = t.get('is_input', False)
if CALL == 'sql':
- ext = '.test'
+ if is_input:
+ ext = '.test.in'
+ else:
+ ext = '.test'
else:
ext = '.maltest'
with open(t.get('test_path') + ext, 'w') as fout:
@@ -670,7 +674,7 @@ def PerformDir(env, testdir, auto=False)
if len(fix.keys()) > 0:
print('-- WARNING expanded variables needs to
be converted back', file=fout)
# print to stdout to make it obvious
- print('-- WARNING expanded variables needs to
be converted back in {}'.format(t.get('test_path') + '.test'))
+ print('-- WARNING expanded variables needs to
be converted back in {}'.format(t.get('test_path') + ext))
for k in fix:
print('--', k,':', fix[k], file=fout)
else:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
