Changeset: 464f1e19b48b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=464f1e19b48b
Modified Files:
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
Branch: default
Log Message:
Improve test to get more stable output (both on Linux and on Windows)
Approve new output
diffs (90 lines):
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat
b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat
@@ -1,21 +1,24 @@
@echo off
-
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
prompt # $t $g
echo on
-call java nl.cwi.monetdb.client.JdbcClient -e -h %HOST% -p %MAPIPORT% -d
%TSTDB% -f "%RELSRCDIR%\authorization.SF-1430616-data.sql"
+call java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p %MAPIPORT% -d
%TSTDB% -f "%RELSRCDIR%\authorization.SF-1430616-data.sql"
-@echo user=voc> .monetdb
-@echo password=voc>> .monetdb
+@echo off
+echo user=voc> .monetdb
+echo password=voc>> .monetdb
+echo on
-call java nl.cwi.monetdb.client.JdbcClient -e -h %HOST% -p %MAPIPORT% -d
%TSTDB% -q
+call java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p %MAPIPORT% -d
%TSTDB% -q
+@echo off
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
+echo on
-call java nl.cwi.monetdb.client.JdbcClient -e -h %HOST% -p %MAPIPORT% -d
%TSTDB% -f "%RELSRCDIR%\authorization.SF-1430616-drop_user.sql"
+call java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p %MAPIPORT% -d
%TSTDB% -f "%RELSRCDIR%\authorization.SF-1430616-drop_user.sql"
@del .monetdb
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
@@ -5,20 +5,20 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h $HOST -p
$MAPIPORT -d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-data.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p
$MAPIPORT -d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-data.sql\""
cat << EOF > .monetdb
user=voc
password=voc
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h $HOST -p
$MAPIPORT -d ${TSTDB} -q"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p
$MAPIPORT -d ${TSTDB} -q"
cat << EOF > .monetdb
user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h $HOST -p
$MAPIPORT -d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-drop_user.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p
$MAPIPORT -d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-drop_user.sql\""
rm -f .monetdb
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
b/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
@@ -25,7 +25,7 @@ Ready.
# 10:24:37 >
-# 10:24:37 > Mtimeout -timeout 60 java -jar
/net/koala.ins.cwi.nl/export/scratch0/niels/Linux-x86_64/build-sql/src/jdbc/jdbcclient-1.3.jar
-h localhost -p 32887 -bmTests_src_test_BugTracker -f
../../../../../../..//scratch1/niels/sql/src/test/BugTracker/Tests/authorization.SF-1430616.sql
+# 10:24:37 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -e -h
localhost -p 32887 -bmTests_sql_test_BugTracker -f
"../../../../../dev/sql/test/BugTracker/Tests/authorization.SF-1430616.sql"
# 10:24:37 >
CREATE USER "voc" WITH PASSWORD 'voc' NAME 'VOC Explorer' SCHEMA "sys";
@@ -61,13 +61,13 @@ 2 rows
# 08:55:00 >
-# 08:55:00 > Mtimeout -timeout 60 java -jar
/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/build-current-monetdb-pegasus.ins.cwi.nl/sql/src/jdbc/jdbcclient-1.3.jar
-h localhost -p 37211 -d mTests_src_test_BugTracker -q
+# 08:55:00 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -e -h
localhost -p 37211 -d mTests_sql_test_BugTracker -q
# 08:55:00 >
auto commit mode: on
-voc->
+sql->
# 15:18:12 >
-# 15:18:12 > Mtimeout -timeout 60 mjclient -h alf -p 30558 -d
mTests_src_test_BugTracker -f
"../../../../../../../../scratch1/niels/rc/sql/src/test/BugTracker/Tests/authorization.SF-1430616-drop_user.sql"
+# 15:18:12 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -e -h
localhost -p 30558 -d mTests_sql_test_BugTracker -f
"../../../../../dev/sql/test/BugTracker/Tests/authorization.SF-1430616-drop_user.sql"
# 15:18:12 >
START TRANSACTION;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
