Update of /cvsroot/monetdb/sql/src/test/VOC/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14066/sql/src/test/VOC/Tests
Modified Files:
Tag: SQL_2-24
All VOC.SQL.bat VOC.SQL.sh
Log Message:
Clean-up of buildtools-, configure-, and testing-legacy in MonetDB-Java.
(
Considered as "bug-fix" by Sjoerd and me.
Has no impact on binary distributions and/or packaging.
Wrapped in tags "JavaTestingCleanUp1_before" & "JavaTestingCleanUp1_after".
Will fix or undo tomorrow in case unexpected problems occur.
)
- Removed "mjclient" as is was not packaged/distributed, anyway.
- Changed test that used "mjclient" to use "jdbcclient.jar" directly.
(Note: "jdbcclient.jar" is not packaged and/or distributed, either, but
only used internally for testing and "convenience".)
- Removed "monetdb-java-config[.bat]" as it was not packaged/distributed,
anyway.
- Changed Mtest.py (and tests) that used monetdb-java-config to find out
where the MonetDB/Java .jar's (and Java/JDBC tests) are installed,
to extract this information from CLASSPATH (falling back to
`monetdb-config --pkgdatadir`/lib and `monetdb-config --pkgdatadir`/Tests
in case CLASSPATH is not set accordingly, assuming MonetDB/Java is stalled
in the same prefix as MonetDB/Common).
- Removed all(?) code that became unused after above changes.
These changes should not break or add any inter-package/-module
dependencies.
TODO (Any help by any Java expert is more than welcome!):
====
For convenience of testing Java/JDBC functionality of binary distributions,
the tests in source/java/tests/ (installed in
<prefix>/share/MonetDB/Tests/*.class) should be collected in a single
"jdbctests.jar" (or alike) to be installed in <prefix>/share/MonetDB/Tests/
or <prefix>/share/MonetDB/lib/ (like the other *.jar files).
If necessary, the tests in sql/src/jdbc/tests/Tests/ then need to be adapted
to use the "jdbctests.jar" instead of the individual
<prefix>/share/MonetDB/Tests/*.class .
Just like "jdbcclient.jar", "jdbctests.jar" is meant for (internal) testing
convenience, only, and not to be distributed.
U All
Index: All
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/VOC/Tests/All,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- All 11 Dec 2007 22:19:06 -0000 1.4
+++ All 1 Jul 2008 15:06:44 -0000 1.4.4.1
@@ -1 +1 @@
-HAVE_MONETDB_JAVAJDBC?VOC
+HAVE_JDBCCLIENT_JAR?VOC
U VOC.SQL.bat
Index: VOC.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/VOC/Tests/VOC.SQL.bat,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- VOC.SQL.bat 29 Oct 2007 20:11:56 -0000 1.3
+++ VOC.SQL.bat 1 Jul 2008 15:06:44 -0000 1.3.4.1
@@ -8,20 +8,20 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCcreate_user.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCcreate_user.sql"
@echo user=voc> .monetdb
@echo password=voc>> .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 java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCschema.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCinsert.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCquery.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCmanual_examples.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCdrop.sql"
@echo user=monetdb> .monetdb
@echo password=monetdb>> .monetdb
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e -f
"%RELSRCDIR%\..\VOCdrop_user.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%RELSRCDIR%\..\VOCdrop_user.sql"
@del .monetdb
U VOC.SQL.sh
Index: VOC.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/VOC/Tests/VOC.SQL.sh,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- VOC.SQL.sh 31 Oct 2007 11:25:05 -0000 1.4
+++ VOC.SQL.sh 1 Jul 2008 15:06:45 -0000 1.4.4.1
@@ -8,24 +8,24 @@
LC_ALL="`locale -a | grep -i en_us | grep -i utf | head -n 1`"
export LC_ALL
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCcreate_user.sql\" 2>&1"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCcreate_user.sql\" 2>&1"
cat << EOF > .monetdb
user=voc
password=voc
EOF
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCschema.sql\" 2>&1"
-Mlog -x "$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"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCschema.sql\" 2>&1"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCinsert.sql\" 2>&1"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCquery.sql\" 2>&1"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCmanual_examples.sql\" 2>&1"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCdrop.sql\" 2>&1"
cat << EOF > .monetdb
user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
\"$RELSRCDIR/../VOCdrop_user.sql\" 2>&1"
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../VOCdrop_user.sql\" 2>&1"
rm -f .monetdb
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
