Changeset: f56b8f83e70a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f56b8f83e70a Modified Files: sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat testing/Mtest.py.bat Branch: Nov2019 Log Message:
Fix some quoting; use Python 3 for testing with Mtest.py.bat on Windows. diffs (54 lines): diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat b/sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat --- a/sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat +++ b/sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat @@ -1,1 +1,4 @@ -"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% "--database=%TSTDB% %TSTSRCBASE%/%TSTDIR%/select1.test" +@prompt # $t $g +@echo on + +"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% --database=%TSTDB% "%TSTSRCBASE%/%TSTDIR%/select1.test" diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat b/sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat --- a/sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat +++ b/sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat @@ -1,1 +1,4 @@ -"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% "--database=%TSTDB% %TSTSRCBASE%/%TSTDIR%/select2.test" +@prompt # $t $g +@echo on + +"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% --database=%TSTDB% "%TSTSRCBASE%/%TSTDIR%/select2.test" diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat b/sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat --- a/sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat +++ b/sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat @@ -1,1 +1,4 @@ -"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% "--database=%TSTDB% %TSTSRCBASE%/%TSTDIR%/select3.test" +@prompt # $t $g +@echo on + +"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% --database=%TSTDB% "%TSTSRCBASE%/%TSTDIR%/select3.test" diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat b/sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat --- a/sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat +++ b/sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat @@ -1,1 +1,4 @@ -"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% "--database=%TSTDB% %TSTSRCBASE%/%TSTDIR%/select4.test" +@prompt # $t $g +@echo on + +"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% --database=%TSTDB% "%TSTSRCBASE%/%TSTDIR%/select4.test" diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat b/sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat --- a/sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat +++ b/sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat @@ -1,1 +1,4 @@ -"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% "--database=%TSTDB% %TSTSRCBASE%/%TSTDIR%/select5.test" +@prompt # $t $g +@echo on + +"%PYTHON3%" "%TSTSRCBASE%/%TSTDIR%/sqllogictest.py" --host=localhost --port=%MAPIPORT% --database=%TSTDB% "%TSTSRCBASE%/%TSTDIR%/select5.test" diff --git a/testing/Mtest.py.bat b/testing/Mtest.py.bat --- a/testing/Mtest.py.bat +++ b/testing/Mtest.py.bat @@ -4,4 +4,4 @@ @REM @REM Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. -@python "%~dpn0" %* +@python3 "%~dpn0" %* _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
