Changeset: 1a359eaaf621 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a359eaaf621
Modified Files:
clients/Tests/MAL-signatures.test
testing/Mconvert.py.in
Branch: mtest
Log Message:
Start server with same options as when testing.
This can produce different output.
diffs (43 lines):
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -1,6 +1,6 @@
query TTTTT rowsort
select * from sys.malfunctions() order by module, "function", address,
signature, comment
----
-64110 values hashing to 2c8d260ec221c669a3c878cf04340222
+65490 values hashing to ca0241b9eab8bb582f3f93a7fd008dd8
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -614,6 +614,19 @@ def PerformDir(env, testdir, auto=False)
fn = t.get('test_path') + t.get('tail')
if verbose:
print('converting {}'.format(test_name), file=sys.stderr)
+ cond = t.get('cond', None)
+ if (cond != None and "HAVE_LIBR" in cond) and
CONDITIONALS['HAVE_LIBR'] and CONDITIONALS['NOT_WIN32']:
+ options.extend(['--set', 'embedded_r=yes'])
+ if (cond != None and "HAVE_LIBPY3" in cond) and
CONDITIONALS['HAVE_LIBPY3']:
+ options.extend(['--set', 'embedded_py=3'])
+ options.extend(['--set', 'embedded_c=true'])
+ try:
+ f = openutf8(os.path.join(os.path.dirname(t.get('test_path')),
'SingleServer'))
+ except IOError:
+ pass
+ else:
+ options.extend(f.read().split())
+ f.close()
try:
with open('/tmp/sqllogic.in', 'w') as fout:
if t.get('is_input', False):
@@ -1623,7 +1636,7 @@ def create_mserver5(dbpath, timeout=0, e
ignore_errors = True)
os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
elif env.get('TRANS_INMEM'):
- cmd.append('--dbextra=:inmemory')
+ cmd.append('--dbextra=:memory:')
return ServerClass(cmd,
outfile,
errfile,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
