Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16943/src/test/mapi/Tests
Modified Files:
Tag: SQL_2-20
mclient-lsql--help.SQL.sh perl_dbi.SQL.bat perl_dbi.SQL.sh
php_monetdb.SQL.bat php_monetdb.SQL.sh python_dbapi.SQL.bat
python_dbapi.SQL.sh python_dbapi_embedded.bat
python_dbapi_embedded.sh sample0.SQL.bat sample0.SQL.sh
sample1.SQL.bat sample1.SQL.sh sample2.SQL.bat sample2.SQL.sh
sample3.SQL.bat sample3.SQL.sh sample4.SQL.bat sample4.SQL.sh
smack00.SQL.bat smack00.SQL.sh smack01.SQL.bat smack01.SQL.sh
Log Message:
Improved quoting of test scripts.
Got rid of the need for Mlog.bat.
Index: sample0.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample0.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample0.SQL.sh 5 Oct 2007 15:08:41 -0000 1.1.2.1
+++ sample0.SQL.sh 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x sample0 $HOST $MAPIPORT sql
+Mlog -x "sample0 $HOST $MAPIPORT sql"
Index: smack01.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/smack01.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- smack01.SQL.sh 5 Oct 2007 15:08:44 -0000 1.1.2.1
+++ smack01.SQL.sh 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x smack01 $MAPIPORT sql
+Mlog -x "smack01 $MAPIPORT sql"
Index: smack01.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/smack01.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- smack01.SQL.bat 5 Oct 2007 15:08:44 -0000 1.1.2.1
+++ smack01.SQL.bat 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x smack01.exe %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+smack01.exe %MAPIPORT% sql
Index: perl_dbi.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/perl_dbi.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- perl_dbi.SQL.sh 20 Oct 2007 19:22:04 -0000 1.1.2.1
+++ perl_dbi.SQL.sh 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -6,4 +6,4 @@
PERLLIB="`monetdb-clients-config --perllibdir`"
export PERLLIB
-Mlog -x sqlsample.pl $MAPIPORT $TSTDB
+Mlog -x "sqlsample.pl $MAPIPORT $TSTDB"
Index: sample4.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample4.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample4.SQL.bat 5 Oct 2007 15:08:44 -0000 1.1.2.1
+++ sample4.SQL.bat 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x sample4.exe %HOST% %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+sample4.exe %HOST% %MAPIPORT% sql
Index: smack00.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/smack00.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- smack00.SQL.bat 5 Oct 2007 15:08:44 -0000 1.1.2.1
+++ smack00.SQL.bat 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x smack00.exe %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+smack00.exe %MAPIPORT% sql
Index: sample0.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample0.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample0.SQL.bat 5 Oct 2007 15:08:41 -0000 1.1.2.1
+++ sample0.SQL.bat 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x sample0.exe %HOST% %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+sample0.exe %HOST% %MAPIPORT% sql
Index: php_monetdb.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/php_monetdb.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- php_monetdb.SQL.bat 22 Oct 2007 19:58:08 -0000 1.1.2.1
+++ php_monetdb.SQL.bat 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -3,4 +3,7 @@
set path=%CLIENTS_PREFIX%\lib\MonetDB\Tests
set dir=%CLIENTS_PREFIX%\%PHP_EXTENSIONDIR%
-call Mlog.bat -x @PHP@ -n -d extension_dir=%dir% -f %path%\sqlsample.php
+prompt # $t $g
+echo on
+
[EMAIL PROTECTED]@ -n -d extension_dir=%dir% -f %path%\sqlsample.php
Index: sample3.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample3.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample3.SQL.bat 5 Oct 2007 15:08:43 -0000 1.1.2.1
+++ sample3.SQL.bat 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x sample3.exe %HOST% %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+sample3.exe %HOST% %MAPIPORT% sql
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- python_dbapi_embedded.sh 28 Oct 2007 10:51:01 -0000 1.1.2.4
+++ python_dbapi_embedded.sh 29 Oct 2007 17:26:10 -0000 1.1.2.5
@@ -7,7 +7,7 @@
export PYTHONPATH
if [ -n "$TST_FIVE" ] ; then
- Mlog -x sqlsample.py $GDK_DBFARM $TSTDB 5
+ Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 5"
else
- Mlog -x sqlsample.py $GDK_DBFARM $TSTDB 4
+ Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 4"
fi
Index: python_dbapi_embedded.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.bat,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- python_dbapi_embedded.bat 28 Oct 2007 10:50:56 -0000 1.1.2.3
+++ python_dbapi_embedded.bat 29 Oct 2007 17:26:10 -0000 1.1.2.4
@@ -6,4 +6,8 @@
set v=4
if "%TST_FIVE%" == "Five" set v=5
-call Mlog.bat -x sqlsample.py %GDK_DBFARM% %TSTDB% %v%
+
+prompt # $t $g
+echo on
+
+sqlsample.py "%GDK_DBFARM%" %TSTDB% %v%
Index: perl_dbi.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/perl_dbi.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- perl_dbi.SQL.bat 20 Oct 2007 19:22:04 -0000 1.1.2.1
+++ perl_dbi.SQL.bat 29 Oct 2007 17:26:09 -0000 1.1.2.2
@@ -4,4 +4,7 @@
set PERLLIB=%CLIENTS_PREFIX%\%PERL_LIBDIR%
-call Mlog.bat -x sqlsample.pl %MAPIPORT% %TSTDB%
+prompt # $t $g
+echo on
+
+sqlsample.pl %MAPIPORT% %TSTDB%
Index: python_dbapi.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi.SQL.bat,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- python_dbapi.SQL.bat 24 Oct 2007 12:31:18 -0000 1.1.2.2
+++ python_dbapi.SQL.bat 29 Oct 2007 17:26:10 -0000 1.1.2.3
@@ -4,4 +4,7 @@
set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
-call Mlog.bat -x sqlsample.py %MAPIPORT% %TSTDB%
+prompt # $t $g
+echo on
+
+sqlsample.py %MAPIPORT% %TSTDB%
Index: sample2.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample2.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample2.SQL.bat 5 Oct 2007 15:08:43 -0000 1.1.2.1
+++ sample2.SQL.bat 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x sample2.exe %HOST% %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+sample2.exe %HOST% %MAPIPORT% sql
Index: python_dbapi.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi.SQL.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- python_dbapi.SQL.sh 24 Oct 2007 12:31:18 -0000 1.1.2.2
+++ python_dbapi.SQL.sh 29 Oct 2007 17:26:10 -0000 1.1.2.3
@@ -6,4 +6,4 @@
PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
export PYTHONPATH
-Mlog -x sqlsample.py $MAPIPORT $TSTDB
+Mlog -x "sqlsample.py $MAPIPORT $TSTDB"
Index: sample1.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample1.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample1.SQL.bat 5 Oct 2007 15:08:42 -0000 1.1.2.1
+++ sample1.SQL.bat 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -2,4 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-call Mlog.bat -x sample1.exe %HOST% %MAPIPORT% sql
+prompt # $t $g
+echo on
+
+sample1.exe %HOST% %MAPIPORT% sql
Index: php_monetdb.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/php_monetdb.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- php_monetdb.SQL.sh 22 Oct 2007 19:58:08 -0000 1.1.2.1
+++ php_monetdb.SQL.sh 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -3,4 +3,4 @@
path="`monetdb-clients-config --pkglibdir`/Tests"
dir="`monetdb-clients-config --phpextensiondir`"
-Mlog -x php -n -d extension_dir=$dir -f $path/sqlsample.php $MAPIPORT
+Mlog -x "php -n -d extension_dir=$dir -f $path/sqlsample.php $MAPIPORT"
Index: sample4.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample4.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample4.SQL.sh 5 Oct 2007 15:08:44 -0000 1.1.2.1
+++ sample4.SQL.sh 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x sample4 $HOST $MAPIPORT sql
+Mlog -x "sample4 $HOST $MAPIPORT sql"
Index: sample1.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample1.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample1.SQL.sh 5 Oct 2007 15:08:42 -0000 1.1.2.1
+++ sample1.SQL.sh 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x sample1 $HOST $MAPIPORT sql
+Mlog -x "sample1 $HOST $MAPIPORT sql"
Index: smack00.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/smack00.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- smack00.SQL.sh 5 Oct 2007 15:08:44 -0000 1.1.2.1
+++ smack00.SQL.sh 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x smack00 $MAPIPORT sql
+Mlog -x "smack00 $MAPIPORT sql"
Index: sample3.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample3.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample3.SQL.sh 5 Oct 2007 15:08:43 -0000 1.1.2.1
+++ sample3.SQL.sh 29 Oct 2007 17:26:11 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x sample3 $HOST $MAPIPORT sql
+Mlog -x "sample3 $HOST $MAPIPORT sql"
Index: mclient-lsql--help.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/mclient-lsql--help.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mclient-lsql--help.SQL.sh 5 Oct 2007 15:08:40 -0000 1.1.2.1
+++ mclient-lsql--help.SQL.sh 29 Oct 2007 17:26:09 -0000 1.1.2.2
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $SQL_CLIENT --help < /dev/null
+Mlog -x "$SQL_CLIENT --help < /dev/null"
Index: sample2.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/sample2.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sample2.SQL.sh 5 Oct 2007 15:08:43 -0000 1.1.2.1
+++ sample2.SQL.sh 29 Oct 2007 17:26:10 -0000 1.1.2.2
@@ -3,4 +3,4 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-Mlog -x sample2 $HOST $MAPIPORT sql
+Mlog -x "sample2 $HOST $MAPIPORT sql"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
