Changeset: 1b36512eb332 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b36512eb332
Added Files:
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.err
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.test
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.reqtests
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.sql
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.err
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.test
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.reqtests
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.stable.err
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.test
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.reqtests
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.stable.err
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.test
Removed Files:
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.bat
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.sh
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.err
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
Modified Files:
sql/test/BugTracker-2009/Tests/All
Branch: mtest
Log Message:
Don't use shell or command line scripts, instead add tests with dependencies
diffs (truncated from 715 to 300 lines):
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -93,7 +93,10 @@ overflow.SF-2853458
bit_and.SF-2850341
double_count_limit_bug.SF-2862146
create_on_ro_db_crash.SF-2830238
-old_views_incorrectly_reused.SF-2863804
+old_views_incorrectly_reused.SF-2863804.def
+old_views_incorrectly_reused.SF-2863804.view1
+old_views_incorrectly_reused.SF-2863804.view2
+old_views_incorrectly_reused.SF-2863804.del
updating_non-loaded_columns.SF-2864313_OK-0
updating_non-loaded_columns.SF-2864313_KO-1
updating_non-loaded_columns.SF-2864313_KO-2
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.bat
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.bat
deleted file mode 100755
---
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@prompt # $t $g
-@echo on
-
-%SQL_CLIENT% "%TSTTRGDIR%\%1%.def.sql"
-%SQL_CLIENT% "%TSTTRGDIR%\%1%.view1.sql"
-%SQL_CLIENT% "%TSTTRGDIR%\%1%.view2.sql"
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.sh
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.sh
deleted file mode 100755
---
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.SQL.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-Mlog -x "$SQL_CLIENT $TSTTRGDIR/$1.def.sql"
-Mlog -x "$SQL_CLIENT $TSTTRGDIR/$1.view1.sql"
-Mlog -x "$SQL_CLIENT $TSTTRGDIR/$1.view2.sql"
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.err
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.err
@@ -0,0 +1,12 @@
+stderr of test 'old_views_incorrectly_reused.SF-2863804.def` in directory
'sql/test/BugTracker-2009` itself:
+
+
+# 14:01:21 >
+# 14:01:21 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-77000" "--port=33925"
+# 14:01:21 >
+
+
+# 14:01:21 >
+# 14:01:21 > "Done."
+# 14:01:21 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.out
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.stable.out
@@ -0,0 +1,30 @@
+stdout of test 'old_views_incorrectly_reused.SF-2863804.def` in directory
'sql/test/BugTracker-2009` itself:
+
+
+# 14:01:21 >
+# 14:01:21 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-77000" "--port=33925"
+# 14:01:21 >
+
+#START TRANSACTION;
+#CREATE TABLE docDict (docID integer, doc VARCHAR(1000), type VARCHAR(100),
prob DOUBLE);
+#CREATE TABLE doc_string (docID integer, attribute VARCHAR(1000), value
VARCHAR(100), prob DOUBLE);
+#INSERT INTO docDict VALUES (1, 'aap','a',1.0);
+[ 1 ]
+#INSERT INTO docDict VALUES (2, 'beer','a',1.0);
+[ 1 ]
+#INSERT INTO docDict VALUES (3, 'noot','a',1.0);
+[ 1 ]
+#INSERT INTO doc_string VALUES (1, 'kind', 'A1',1.0);
+[ 1 ]
+#INSERT INTO doc_string VALUES (2, 'date', '2000',1.0);
+[ 1 ]
+#INSERT INTO doc_string VALUES (2, 'kind', 'A2',1.0);
+[ 1 ]
+#INSERT INTO doc_string VALUES (3, 'date', '2001',1.0);
+[ 1 ]
+#COMMIT;
+
+# 14:01:21 >
+# 14:01:21 > "Done."
+# 14:01:21 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.test
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.test
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.def.test
@@ -0,0 +1,34 @@
+statement ok
+START TRANSACTION
+
+statement ok
+CREATE TABLE docDict (docID integer, doc VARCHAR(1000), type VARCHAR(100),
prob DOUBLE)
+
+statement ok
+CREATE TABLE doc_string (docID integer, attribute VARCHAR(1000), value
VARCHAR(100), prob DOUBLE)
+
+statement ok
+INSERT INTO docDict VALUES (1, 'aap','a',1.0)
+
+statement ok
+INSERT INTO docDict VALUES (2, 'beer','a',1.0)
+
+statement ok
+INSERT INTO docDict VALUES (3, 'noot','a',1.0)
+
+statement ok
+INSERT INTO doc_string VALUES (1, 'kind', 'A1',1.0)
+
+statement ok
+INSERT INTO doc_string VALUES (2, 'date', '2000',1.0)
+
+statement ok
+INSERT INTO doc_string VALUES (2, 'kind', 'A2',1.0)
+
+statement ok
+INSERT INTO doc_string VALUES (3, 'date', '2001',1.0)
+
+statement ok
+COMMIT
+
+
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.reqtests
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.reqtests
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.reqtests
@@ -0,0 +1,1 @@
+old_views_incorrectly_reused.SF-2863804.def
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.sql
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.sql
@@ -0,0 +1,4 @@
+START TRANSACTION;
+DROP TABLE docDict;
+DROP TABLE doc_string;
+COMMIT;
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.err
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.err
@@ -0,0 +1,12 @@
+stderr of test 'old_views_incorrectly_reused.SF-2863804.del` in directory
'sql/test/BugTracker-2009` itself:
+
+
+# 14:01:33 >
+# 14:01:33 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-77538" "--port=39848"
+# 14:01:33 >
+
+
+# 14:01:33 >
+# 14:01:33 > "Done."
+# 14:01:33 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.out
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.stable.out
@@ -0,0 +1,16 @@
+stdout of test 'old_views_incorrectly_reused.SF-2863804.del` in directory
'sql/test/BugTracker-2009` itself:
+
+
+# 14:01:33 >
+# 14:01:33 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-77538" "--port=39848"
+# 14:01:33 >
+
+#START TRANSACTION;
+#DROP TABLE docDict;
+#DROP TABLE doc_string;
+#COMMIT;
+
+# 14:01:33 >
+# 14:01:33 > "Done."
+# 14:01:33 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.test
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.test
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.del.test
@@ -0,0 +1,13 @@
+statement ok
+START TRANSACTION
+
+statement ok
+DROP TABLE docDict
+
+statement ok
+DROP TABLE doc_string
+
+statement ok
+COMMIT
+
+
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.err
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.err
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.err
+++ /dev/null
@@ -1,91 +0,0 @@
-stderr of test 'old_views_incorrectly_reused.SF-2863804` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 23:06:16 >
-# 23:06:16 > mserver5
"--config=/home/wouter/opt/MonetDB-Aug2009/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/home/wouter/opt/MonetDB-Aug2009/lib/MonetDB5:/home/wouter/opt/MonetDB-Aug2009/lib/MonetDB5/lib:/home/wouter/opt/MonetDB-Aug2009/lib/MonetDB5/bin"
--set "gdk_dbfarm=/home/wouter/opt/MonetDB-Aug2009/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=31419 --set
xrpc_port=44400 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 23:06:16 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.32.0
-# builtin opt prefix = /home/wouter/opt/MonetDB-Aug2009
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = sql_logs
-# builtin opt xquery_logdir = xquery_logs
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /home/wouter/opt/MonetDB-Aug2009
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /home/wouter/opt/MonetDB-Aug2009
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_autosense = false
-# config opt mapi_open = false
-# config opt sql_optimizer =
inline,remap,evaluate,costModel,coercions,emptySet,cluster,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# cmdline opt config = /home/wouter/opt/MonetDB-Aug2009/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/home/wouter/opt/MonetDB-Aug2009/lib/MonetDB5:/home/wouter/opt/MonetDB-Aug2009/lib/MonetDB5/lib:/home/wouter/opt/MonetDB-Aug2009/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/home/wouter/opt/MonetDB-Aug2009/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 31419
-# cmdline opt xrpc_port = 44400
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /home/wouter/opt/MonetDB-Aug2009/etc/monetdb5.conf)
-
-# 23:06:17 >
-# 23:06:17 > ./old_views_incorrectly_reused.SF-2863804.SQL.sh
old_views_incorrectly_reused.SF-2863804
-# 23:06:17 >
-
-
-# 23:06:17 >
-# 23:06:17 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=localhost --port=31419
/home/wouter/opt/MonetDB-Aug2009/mTests/src/test/BugTracker-2009/old_views_incorrectly_reused.SF-2863804.def.sql
-# 23:06:17 >
-
-
-# 23:06:18 >
-# 23:06:18 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=localhost --port=31419
/home/wouter/opt/MonetDB-Aug2009/mTests/src/test/BugTracker-2009/old_views_incorrectly_reused.SF-2863804.view1.sql
-# 23:06:18 >
-
-
-# 23:06:18 >
-# 23:06:18 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=localhost --port=31419
/home/wouter/opt/MonetDB-Aug2009/mTests/src/test/BugTracker-2009/old_views_incorrectly_reused.SF-2863804.view2.sql
-# 23:06:18 >
-
-
-# 23:06:18 >
-# 23:06:18 > Done.
-# 23:06:18 >
-
diff --git
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
+++ /dev/null
@@ -1,178 +0,0 @@
-stdout of test 'old_views_incorrectly_reused.SF-2863804` in directory
'sql/test/BugTracker-2009` itself:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
