Update of /cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14066/sql/src/test/BugDay_2005-10-06_2.9.3/Tests
Modified Files:
Tag: SQL_2-24
All alter_table_describe.SF-1146092.SQL.bat
alter_table_describe.SF-1146092.SQL.sh
not_null.SF-933194.SQL.bat not_null.SF-933194.SQL.sh
type_dump_test.SF-989257.SQL.bat
type_dump_test.SF-989257.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 not_null.SF-933194.SQL.sh
Index: not_null.SF-933194.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- not_null.SF-933194.SQL.sh 29 Oct 2007 20:11:47 -0000 1.2
+++ not_null.SF-933194.SQL.sh 1 Jul 2008 15:06:36 -0000 1.2.4.1
@@ -8,7 +8,7 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d $TSTDB -f
\"$RELSRCDIR/not_null.SF-933194-src.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$RELSRCDIR/not_null.SF-933194-src.sql\""
rm -f .monetdb
Index: alter_table_describe.SF-1146092.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.bat,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- alter_table_describe.SF-1146092.SQL.bat 29 Oct 2007 20:11:45 -0000
1.5
+++ alter_table_describe.SF-1146092.SQL.bat 1 Jul 2008 15:06:35 -0000
1.5.4.1
@@ -8,6 +8,6 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\alter_table_describe.SF-1146092-src.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\alter_table_describe.SF-1146092-src.sql"
@del .monetdb
Index: All
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/All,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -d -r1.10.4.1 -r1.10.4.2
--- All 3 Jun 2008 07:03:52 -0000 1.10.4.1
+++ All 1 Jul 2008 15:06:34 -0000 1.10.4.2
@@ -27,7 +27,7 @@
create_table_default.SF-931573
comment_only.SF-931619
set_types.SF-932360
-HAVE_MONETDB_JAVAJDBC?not_null.SF-933194
+HAVE_JDBCCLIENT_JAR?not_null.SF-933194
create_drop_schema.SF-933546
singleton_view.SF-933573
foreign_key_in_frontend_crashes_backend.SF-935578
@@ -38,7 +38,7 @@
view_on_deleted_table.SF-938583
reserved_words.SF-939112
div_by_zero.SF-987304
-HAVE_MONETDB_JAVAJDBC?type_dump_test.SF-989257
+HAVE_JDBCCLIENT_JAR?type_dump_test.SF-989257
sesamstr_parser_error.SF-993366
simple_union.SF-1005596
BATpropcheck_error.SF-1012739
@@ -47,7 +47,7 @@
error_in_sql_parser.SF-1019122
cross_product.SF-1122802
max_min_sum_null.SF-1123132
-HAVE_MONETDB_JAVAJDBC?alter_table_describe.SF-1146092
+HAVE_JDBCCLIENT_JAR?alter_table_describe.SF-1146092
affected_rows_count.SF-1149757
var_char_cast_truncate.SF-1150907
foreign_key_null.SF-1164646
Index: type_dump_test.SF-989257.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.bat,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- type_dump_test.SF-989257.SQL.bat 29 Oct 2007 20:11:47 -0000 1.5
+++ type_dump_test.SF-989257.SQL.bat 1 Jul 2008 15:06:36 -0000 1.5.4.1
@@ -8,6 +8,6 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\type_dump_test.SF-989257-src.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\type_dump_test.SF-989257-src.sql"
@del .monetdb
U alter_table_describe.SF-1146092.SQL.sh
Index: alter_table_describe.SF-1146092.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- alter_table_describe.SF-1146092.SQL.sh 29 Oct 2007 20:11:46 -0000
1.2
+++ alter_table_describe.SF-1146092.SQL.sh 1 Jul 2008 15:06:35 -0000
1.2.4.1
@@ -8,6 +8,6 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d $TSTDB -f
\"$RELSRCDIR/alter_table_describe.SF-1146092-src.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$RELSRCDIR/alter_table_describe.SF-1146092-src.sql\""
rm -f .monetdb
Index: not_null.SF-933194.SQL.bat
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.bat,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- not_null.SF-933194.SQL.bat 29 Oct 2007 20:11:47 -0000 1.5
+++ not_null.SF-933194.SQL.bat 1 Jul 2008 15:06:35 -0000 1.5.4.1
@@ -8,6 +8,6 @@
prompt # $t $g
echo on
-call mjclient -h %HOST% -p %MAPIPORT% -d %TSTDB% -f
"%RELSRCDIR%\not_null.SF-933194-src.sql"
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-f "%RELSRCDIR%\not_null.SF-933194-src.sql"
@del .monetdb
U type_dump_test.SF-989257.SQL.sh
Index: type_dump_test.SF-989257.SQL.sh
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- type_dump_test.SF-989257.SQL.sh 29 Oct 2007 20:11:47 -0000 1.2
+++ type_dump_test.SF-989257.SQL.sh 1 Jul 2008 15:06:36 -0000 1.2.4.1
@@ -8,6 +8,6 @@
LANG="en_US.UTF-8"
export LANG
-Mlog -x "$MTIMEOUT mjclient -h $HOST -p $MAPIPORT -d $TSTDB -f
\"$RELSRCDIR/type_dump_test.SF-989257-src.sql\""
+Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$RELSRCDIR/type_dump_test.SF-989257-src.sql\""
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
