Update of /cvsroot/monetdb/sql/src/test/bugs/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16943/src/test/bugs/Tests

Modified Files:
      Tag: SQL_2-20
        except-union-intersect-bug-sf-1146079.SQL.bat 
        except-union-intersect-bug-sf-1146079.SQL.sh 
        unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat 
        unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh 
Log Message:
Improved quoting of test scripts.
Got rid of the need for Mlog.bat.

Index: except-union-intersect-bug-sf-1146079.SQL.bat
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.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
--- except-union-intersect-bug-sf-1146079.SQL.bat       5 Oct 2007 12:25:07 
-0000       1.1.2.1
+++ except-union-intersect-bug-sf-1146079.SQL.bat       29 Oct 2007 17:26:09 
-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% -e -f 
"%RELSRCDIR%\..\except-union-intersect-bug-sf-1146079.sql"
+prompt # $t $g  
+echo on
 
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f 
"%RELSRCDIR%\..\except-union-intersect-bug-sf-1146079.sql"
+
[EMAIL PROTECTED] .monetdb

Index: except-union-intersect-bug-sf-1146079.SQL.sh
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- except-union-intersect-bug-sf-1146079.SQL.sh        29 Aug 2007 20:17:25 
-0000      1.1
+++ except-union-intersect-bug-sf-1146079.SQL.sh        29 Oct 2007 17:26:09 
-0000      1.1.4.1
@@ -8,7 +8,6 @@
 LC_CTYPE="en_US.UTF-8"
 export LC_CTYPE
 
-Mlog   "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f 
$RELSRCDIR/../except-union-intersect-bug-sf-1146079.sql"
-       $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f 
$RELSRCDIR/../except-union-intersect-bug-sf-1146079.sql 
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f 
\"$RELSRCDIR/../except-union-intersect-bug-sf-1146079.sql\""
 
 rm -f .monetdb

Index: unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.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
--- unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat   5 Oct 2007 12:25:07 
-0000       1.1.2.1
+++ unicode_varchar-bug-sf-1041324_JdbcClient.SQL.bat   29 Oct 2007 17:26:09 
-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%\..\unicode_varchar-bug-sf-1041324.sql"
+prompt # $t $g  
+echo on
 
-del .monetdb
+call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f 
"%RELSRCDIR%\..\unicode_varchar-bug-sf-1041324.sql"
+
[EMAIL PROTECTED] .monetdb

Index: unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.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
--- unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh    5 Oct 2007 12:25:08 
-0000       1.1.4.1
+++ unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh    29 Oct 2007 17:26:09 
-0000      1.1.4.2
@@ -8,7 +8,6 @@
 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} -f 
$RELSRCDIR/../unicode_varchar-bug-sf-1041324.sql"
-       $MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f 
$RELSRCDIR/../unicode_varchar-bug-sf-1041324.sql 
+Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -f 
\"$RELSRCDIR/../unicode_varchar-bug-sf-1041324.sql\""
 
 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

Reply via email to