Changeset: 3a5711aae198 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a5711aae198
Modified Files:
sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
Branch: Nov2019
Log Message:
Correct 2 SQL.bat and SQL.sh files (should have invoked the general
Test.SQL.{bat|sh} file)
diffs (54 lines):
diff --git a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
--- a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
+++ b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
@@ -1,8 +1,1 @@
-@echo off
-
-set
URL=jdbc:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?user=monetdb^&password=monetdb%JDBC_EXTRA_ARGS%
-
-prompt # $t $g
-echo on
-
-java %TST% "%URL%"
+@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
--- a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
+++ b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
@@ -1,5 +1,3 @@
#!/bin/sh
-URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
-
-Mlog -x "java ${TST} \"${URL}\""
+$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
--- a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
+++ b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
@@ -1,8 +1,1 @@
-@echo off
-
-set
URL=jdbc:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?user=monetdb^&password=monetdb%JDBC_EXTRA_ARGS%
-
-prompt # $t $g
-echo on
-
-java %TST% "%URL%"
+@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
--- a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
@@ -1,5 +1,3 @@
#!/bin/sh
-URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
-
-Mlog -x "java ${TST} \"${URL}\""
+$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
--- a/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
$TSTSRCDIR/Test.SQL.sh $*
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
