Update of /cvsroot/monetdb/sql/src/test/VOC/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16943/src/test/VOC/Tests
Modified Files:
Tag: SQL_2-20
VOC.SQL.bat VOC.SQL.sh
Log Message:
Improved quoting of test scripts.
Got rid of the need for Mlog.bat.
Index: VOC.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/VOC/Tests/VOC.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
--- VOC.SQL.bat 5 Oct 2007 12:25:06 -0000 1.1.2.1
+++ VOC.SQL.bat 29 Oct 2007 17:26:09 -0000 1.1.2.2
@@ -5,20 +5,23 @@
set LANG=en_US.UTF-8
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCcreate_user.sql"
+prompt # $t $g
+echo on
-echo user=voc> .monetdb
-echo password=voc>> .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCcreate_user.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCschema.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCinsert.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCquery.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCmanual_examples.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCdrop.sql"
[EMAIL PROTECTED] user=voc> .monetdb
[EMAIL PROTECTED] password=voc>> .monetdb
-echo user=monetdb> .monetdb
-echo password=monetdb>> .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCschema.sql"
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCinsert.sql"
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCquery.sql"
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCmanual_examples.sql"
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCdrop.sql"
-call Mlog.bat -x mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCdrop_user.sql"
[EMAIL PROTECTED] user=monetdb> .monetdb
[EMAIL PROTECTED] password=monetdb>> .monetdb
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCdrop_user.sql"
+
[EMAIL PROTECTED] .monetdb
Index: VOC.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/VOC/Tests/VOC.SQL.sh,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- VOC.SQL.sh 5 Oct 2007 12:25:07 -0000 1.1.4.1
+++ VOC.SQL.sh 29 Oct 2007 17:26:09 -0000 1.1.4.2
@@ -8,31 +8,24 @@
LC_ALL="`locale -a | grep -i en_us | grep -i utf | head -n 1`"
export LC_ALL
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCcreate_user.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCcreate_user.sql 2>&1
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCcreate_user.sql\" 2>&1"
cat << EOF > .monetdb
user=voc
password=voc
EOF
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCschema.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCschema.sql 2>&1
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCinsert.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCinsert.sql 2>&1
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCquery.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCquery.sql 2>&1
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCmanual_examples.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCmanual_examples.sql 2>&1
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCdrop.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCdrop.sql 2>&1
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCschema.sql\" 2>&1"
+Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCinsert.sql\" 2>&1"
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCquery.sql\" 2>&1"
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCmanual_examples.sql\" 2>&1"
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCdrop.sql\" 2>&1"
cat << EOF > .monetdb
user=monetdb
password=monetdb
EOF
-Mlog "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCdrop_user.sql"
- $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$RELSRCDIR/../VOCdrop_user.sql 2>&1
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCdrop_user.sql\" 2>&1"
rm -f .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
