Update of /cvsroot/monetdb/sql/src/test/BugTracker/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16943/src/test/BugTracker/Tests
Modified Files:
Tag: SQL_2-20
authorization.SF-1430616.SQL.bat
authorization.SF-1430616.SQL.sh auto_commit.SF-1724151.SQL.py
drop_schema_crash.SF-1504794.SQL.bat
drop_schema_crash.SF-1504794.SQL.sh explain.SF-1739353.SQL.bat
explain.SF-1739353.SQL.sh jdbc_no_debug.SF-1739356.SQL.bat
jdbc_no_debug.SF-1739356.SQL.sh
mapi_connect_errors_vanish.SF-1432134.SQL.bat
mapi_connect_errors_vanish.SF-1432134.SQL.sh
Log Message:
Improved quoting of test scripts.
Got rid of the need for Mlog.bat.
Index: jdbc_no_debug.SF-1739356.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.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
--- jdbc_no_debug.SF-1739356.SQL.sh 3 Oct 2007 07:36:34 -0000 1.1.2.1
+++ jdbc_no_debug.SF-1739356.SQL.sh 29 Oct 2007 17:26:08 -0000 1.1.2.2
@@ -8,7 +8,6 @@
LANG="en_US.UTF-8"
export LANG
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql\""
rm -f .monetdb
Index: drop_schema_crash.SF-1504794.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/drop_schema_crash.SF-1504794.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
--- drop_schema_crash.SF-1504794.SQL.bat 5 Oct 2007 12:25:03 -0000
1.1.2.1
+++ drop_schema_crash.SF-1504794.SQL.bat 29 Oct 2007 17:26:07 -0000
1.1.2.2
@@ -5,6 +5,9 @@
set LANG=en_US.UTF-8
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d $%TSTDB% -f
"%RELSRCDIR%\drop_schema_crash.SF-1504794-data.sql"
+prompt # $t $g
+echo on
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\drop_schema_crash.SF-1504794-data.sql"
+
[EMAIL PROTECTED] .monetdb
Index: auto_commit.SF-1724151.SQL.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- auto_commit.SF-1724151.SQL.py 29 May 2007 11:58:48 -0000 1.1
+++ auto_commit.SF-1724151.SQL.py 29 Oct 2007 17:26:07 -0000 1.1.6.1
@@ -1,5 +1,5 @@
import os, sys
-cltcmd = "%s %s" % (os.getenv('SQL_CLIENT'),
os.path.join(os.getenv('TSTSRCDIR'), sys.argv[1]+".txt"))
+cltcmd = '%s "%s"' % (os.getenv('SQL_CLIENT'),
os.path.join(os.getenv('TSTSRCDIR'), sys.argv[1]+".txt"))
os.system(cltcmd);
Index: authorization.SF-1430616.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- authorization.SF-1430616.SQL.sh 29 Aug 2007 20:17:04 -0000 1.1
+++ authorization.SF-1430616.SQL.sh 29 Oct 2007 17:26:07 -0000 1.1.4.1
@@ -8,15 +8,13 @@
LANG="en_US.UTF-8"
export LANG
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/authorization.SF-1430616-data.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/authorization.SF-1430616-data.sql
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/authorization.SF-1430616-data.sql\""
cat << EOF > .monetdb
user=voc
password=voc
EOF
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -q"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -q
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -q"
rm -f .monetdb
Index: explain.SF-1739353.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/explain.SF-1739353.SQL.sh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- explain.SF-1739353.SQL.sh 29 Aug 2007 20:17:07 -0000 1.1
+++ explain.SF-1739353.SQL.sh 29 Oct 2007 17:26:07 -0000 1.1.4.1
@@ -8,7 +8,6 @@
LANG="en_US.UTF-8"
export LANG
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/explain.SF-1739353-data.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/explain.SF-1739353-data.sql
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/explain.SF-1739353-data.sql\""
rm -f .monetdb
Index: mapi_connect_errors_vanish.SF-1432134.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- mapi_connect_errors_vanish.SF-1432134.SQL.sh 30 Aug 2007 00:07:37
-0000 1.2
+++ mapi_connect_errors_vanish.SF-1432134.SQL.sh 29 Oct 2007 17:26:08
-0000 1.2.4.1
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $SQL_CLIENT -uinvalid -Pinvalid
+Mlog -x "$SQL_CLIENT -uinvalid -Pinvalid"
Index: mapi_connect_errors_vanish.SF-1432134.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.bat,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- mapi_connect_errors_vanish.SF-1432134.SQL.bat 30 Aug 2007 00:07:37
-0000 1.3
+++ mapi_connect_errors_vanish.SF-1432134.SQL.bat 29 Oct 2007 17:26:08
-0000 1.3.2.1
@@ -1,3 +1,4 @@
[EMAIL PROTECTED] off
[EMAIL PROTECTED] # $t $g
[EMAIL PROTECTED] on
-call Mlog.bat -x %SQL_CLIENT% -uinvalid -Pinvalid
+%SQL_CLIENT% -uinvalid -Pinvalid
Index: drop_schema_crash.SF-1504794.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- drop_schema_crash.SF-1504794.SQL.sh 29 Aug 2007 20:17:05 -0000 1.1
+++ drop_schema_crash.SF-1504794.SQL.sh 29 Oct 2007 17:26:07 -0000 1.1.4.1
@@ -8,5 +8,4 @@
LANG="en_US.UTF-8"
export LANG
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f
\"$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql\""
Index: jdbc_no_debug.SF-1739356.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.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
--- jdbc_no_debug.SF-1739356.SQL.bat 5 Oct 2007 12:25:05 -0000 1.1.2.1
+++ jdbc_no_debug.SF-1739356.SQL.bat 29 Oct 2007 17:26:07 -0000 1.1.2.2
@@ -5,6 +5,9 @@
set LANG=en_US.UTF-8
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\jdbc_no_debug.SF-1739356-data.sql"
+prompt # $t $g
+echo on
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\jdbc_no_debug.SF-1739356-data.sql"
+
[EMAIL PROTECTED] .monetdb
Index: authorization.SF-1430616.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/authorization.SF-1430616.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
--- authorization.SF-1430616.SQL.bat 5 Oct 2007 12:25:02 -0000 1.1.2.1
+++ authorization.SF-1430616.SQL.bat 29 Oct 2007 17:26:07 -0000 1.1.2.2
@@ -5,11 +5,14 @@
set LANG=en_US.UTF-8
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\authorization.SF-1430616-data.sql"
+prompt # $t $g
+echo on
-echo user=voc> .monetdb
-echo password=voc>> .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\authorization.SF-1430616-data.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -q
[EMAIL PROTECTED] user=voc> .monetdb
[EMAIL PROTECTED] password=voc>> .monetdb
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -q
+
[EMAIL PROTECTED] .monetdb
Index: explain.SF-1739353.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/explain.SF-1739353.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
--- explain.SF-1739353.SQL.bat 5 Oct 2007 12:25:05 -0000 1.1.2.1
+++ explain.SF-1739353.SQL.bat 29 Oct 2007 17:26:07 -0000 1.1.2.2
@@ -5,6 +5,9 @@
set LANG=en_US.UTF-8
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\explain.SF-1739353-data.sql"
+prompt # $t $g
+echo on
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\explain.SF-1739353-data.sql"
+
[EMAIL PROTECTED] .monetdb
-------------------------------------------------------------------------
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
