Changeset: 2a9f1ac26341 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a9f1ac26341
Modified Files:
monetdb5/modules/mal/tablet.c
testing/Mtest.py.in
Branch: default
Log Message:
small fixes to get clients run out side of tree.
diffs (36 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -909,7 +909,7 @@ SQLinsert_val(READERtask *task, int col,
s = scpy;
}
MT_lock_set(&errorlock);
- snprintf(buf, sizeof(buf), "line " LLFMT " field %d
'%s' expected in '%s'", row, col, fmt->type, s ? s : buf);
+ snprintf(buf, sizeof(buf), "line " LLFMT " field %s
'%s' expected in '%s'", row, fmt->name?fmt->name:"", fmt->type, s ? s : buf);
GDKfree(s);
buf[sizeof(buf)-1]=0;
if (task->as->error == NULL && (task->as->error =
GDKstrdup(buf)) == NULL)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1200,9 +1200,9 @@ def PerformDir(env, testdir, testlist, B
os.environ['TSTTRGDIR'] = TSTTRGDIR
os.environ['RELSRCDIR'] = env['RELSRCDIR']
os.environ['PYTHON2'] = '@QXPYTHON2@'
- os.environ['PYTHON2PATH'] = _configure(os.path.join('@QXprefix@',
'@QXPYTHON2_LIBDIR@'))
+ os.environ['PYTHON2PATH'] += os.path.pathsep +
_configure(os.path.join('@QXprefix@', '@QXPYTHON2_LIBDIR@'))
os.environ['PYTHON3'] = '@QXPYTHON3@'
- os.environ['PYTHON3PATH'] = _configure(os.path.join('@QXprefix@',
'@QXPYTHON3_LIBDIR@'))
+ os.environ['PYTHON3PATH'] += os.path.pathsep +
_configure(os.path.join('@QXprefix@', '@QXPYTHON3_LIBDIR@'))
if os.name == 'nt':
os.environ['PYTHON2PATH'] += os.path.pathsep +
_configure(os.path.join('@QXprefix@', 'lib', 'python2'))
os.environ['PYTHON3PATH'] += os.path.pathsep +
_configure(os.path.join('@QXprefix@', 'lib', 'python3'))
@@ -3725,7 +3725,7 @@ def main(argv) :
if not os.path.exists(rdir):
os.makedirs(rdir)
if CheckExec('php'):
- proc = process.Popen(['php', '-r', "require
'monetdb/php_monetdb.php';"],
+ proc = process.Popen(['php', '-d', 'include_path=${PHP_INCPATH}',
'-r', "require 'monetdb/php_monetdb.php';"],
stdout = process.PIPE, stderr = process.PIPE,
universal_newlines = True)
php_out, php_err = proc.communicate()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
