Changeset: d7c15c16bc8e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7c15c16bc8e
Added Files:
sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
Removed Files:
sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
Modified Files:
sql/test/mapi/Tests/All
testing/Mtest.py.in
Branch: Oct2012
Log Message:
python: misc changes to run tests with both python2 and python3
Mtest: export PYTHON2 and PYTHON3 to the test env (so we can run the
right interpreter)
python_test_monetdb_sql: duplicate and fix for python2 and python3
diffs (122 lines):
diff --git a/sql/test/mapi/Tests/All b/sql/test/mapi/Tests/All
--- a/sql/test/mapi/Tests/All
+++ b/sql/test/mapi/Tests/All
@@ -10,4 +10,5 @@ HAVE_PYTHON?python_dbapi
HAVE_GEOM&HAVE_PHP?php_monetdb
!HAVE_GEOM&HAVE_PHP?php_monetdb_nogeom
utf8test
-python_test_monetdb_sql
+HAVE_PYTHON2?python2_test_monetdb_sql
+HAVE_PYTHON3?python3_test_monetdb_sql
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
b/sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat
rename from sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
rename to sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
+++ b/sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat
@@ -8,4 +8,4 @@ set PYTHONPATH=%testpath%;%PYTHONPATH%
prompt # $t $g
echo on
-python "%testpath%/runtests.py"
+%PYTHON2% "%testpath%/runtests.py"
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
b/sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh
rename from sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
rename to sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
+++ b/sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh
@@ -6,4 +6,4 @@ testpath="$TSTSRCBASE/../clients/python2
PYTHONPATH=$testpath:$PYTHONPATH
export PYTHONPATH
-Mlog -x "python $testpath/runtests.py"
+Mlog -x "${PYTHON2} $testpath/runtests.py"
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
b/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
rename from sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
rename to sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
+++ b/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'python_test_monetdb_sql` in directory 'test/mapi` itself:
+stderr of test 'python2_test_monetdb_sql` in directory 'test/mapi` itself:
# 11:54:47 >
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
b/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
rename from sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
rename to sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
+++ b/sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'python_test_monetdb_sql` in directory 'test/mapi` itself:
+stdout of test 'python2_test_monetdb_sql` in directory 'test/mapi` itself:
# 11:54:47 >
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
b/sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat
copy from sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
copy to sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
+++ b/sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat
@@ -2,10 +2,10 @@
rem must be aligned with the installation directory chosen in
rem clients/python/test/Makefile.ag
-set testpath=%TSTSRCBASE%\..\clients\python2\test
+set testpath=%TSTSRCBASE%\..\clients\python3\test
set PYTHONPATH=%testpath%;%PYTHONPATH%
prompt # $t $g
echo on
-python "%testpath%/runtests.py"
+%PYTHON3% "%testpath%/runtests.py"
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
b/sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh
copy from sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
copy to sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
+++ b/sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh
@@ -2,8 +2,8 @@
# must be aligned with the installation directory chosen in
# clients/python/test/Makefile.ag
-testpath="$TSTSRCBASE/../clients/python2/test"
+testpath="$TSTSRCBASE/../clients/python3/test"
PYTHONPATH=$testpath:$PYTHONPATH
export PYTHONPATH
-Mlog -x "python $testpath/runtests.py"
+Mlog -x "${PYTHON3} $testpath/runtests.py"
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
b/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
copy from sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
copy to sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
+++ b/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'python_test_monetdb_sql` in directory 'test/mapi` itself:
+stderr of test 'python3_test_monetdb_sql` in directory 'test/mapi` itself:
# 11:54:47 >
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
b/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
copy from sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
copy to sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
+++ b/sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'python_test_monetdb_sql` in directory 'test/mapi` itself:
+stdout of test 'python3_test_monetdb_sql` in directory 'test/mapi` itself:
# 11:54:47 >
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1163,6 +1163,8 @@ def PerformDir(env, testdir, testlist, B
os.environ['TSTSRCDIR'] = TSTSRCDIR
os.environ['TSTTRGDIR'] = TSTTRGDIR
os.environ['RELSRCDIR'] = env['RELSRCDIR']
+ os.environ['PYTHON2'] = '@PYTHON2@'
+ os.environ['PYTHON3'] = '@PYTHON3@'
#STDERR.flush()
#for v in 'RELSRCDIR':
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
