Changeset: 792fdcf26fe7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=792fdcf26fe7
Removed Files:
monetdb5/tools/Tests/mserver5--help
monetdb5/tools/Tests/mserver5--help.bat
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
monetdb5/tools/Tests/mserver5--help.stable.out
Modified Files:
clients/R/Tests/deps-install.R
monetdb5/tools/Tests/All
tools/mserver/shutdowntest.c
Branch: mtest
Log Message:
Silence some tests.
diffs (191 lines):
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -8,6 +8,6 @@ cat("#~BeginProfilingOutput~#\n", file=s
install.packages(packages_required, repos="http://cran.rstudio.com/";)
cat("#~EndProfilingOutput~#\n", file=stderr())
-cat("#~EndProfilingOutput~#\n\n", file=stdout())
+cat("#~EndProfilingOutput~#\n", file=stdout())
stopifnot(all(c(packages_required, "DBI") %in%
installed.packages()[,"Package"]))
diff --git a/monetdb5/tools/Tests/All b/monetdb5/tools/Tests/All
--- a/monetdb5/tools/Tests/All
+++ b/monetdb5/tools/Tests/All
@@ -1,3 +1,2 @@
-mserver5--help
mclient-t-s
HAVE_IPV6?mserver5-ipv6
diff --git a/monetdb5/tools/Tests/mserver5--help
b/monetdb5/tools/Tests/mserver5--help
deleted file mode 100755
--- a/monetdb5/tools/Tests/mserver5--help
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-Mlog -x mserver5 --help
diff --git a/monetdb5/tools/Tests/mserver5--help.bat
b/monetdb5/tools/Tests/mserver5--help.bat
deleted file mode 100755
--- a/monetdb5/tools/Tests/mserver5--help.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo on
-@prompt # $t $g
-
- mserver5.exe --help
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err
b/monetdb5/tools/Tests/mserver5--help.stable.err
deleted file mode 100644
--- a/monetdb5/tools/Tests/mserver5--help.stable.err
+++ /dev/null
@@ -1,40 +0,0 @@
-stderr of test 'mserver5--help` in directory 'monetdb5/tools` itself:
-
-
-# 16:36:12 >
-# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help
-# 16:36:12 >
-
-
-# 16:36:12 >
-# 16:36:12 > Mtimeout -timeout 60 mserver5 --config= --help
-# 16:36:12 >
-
-Usage: mserver5 [options]
- --dbpath=<directory> Specify database location
- --dbextra=<directory> Directory for transient BATs
- --dbtrace=<file> File for produced traces
- --in-memory Run database in-memory only
- --config=<config_file> Use config_file to read options from
- --single-user Allow only one user at a time
- --readonly Safeguard database
- --set <option>=<value> Set configuration option
- --help Print this list of options
- --version Print version and compile time info
-The debug, testing & trace options:
- --algorithms
- --forcemito
- --heaps
- --io
- --memory
- --modules
- --performance
- --properties
- --threads
- --transactions
- --debug=<bitmask>
-
-# 10:03:11 >
-# 10:03:11 > Done.
-# 10:03:11 >
-
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
deleted file mode 100644
--- a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'mserver5--help` in directory 'monetdb5/tools` itself:
-
-
-# 16:36:12 >
-# 16:36:12 > ".\mserver5--help.bat" "mserver5--help"
-# 16:36:12 >
-
-Usage: mserver5.exe [options]
- --dbpath=<directory> Specify database location
- --dbextra=<directory> Directory for transient BATs
- --dbtrace=<file> File for produced traces
- --in-memory Run database in-memory only
- --config=<config_file> Use config_file to read options from
- --single-user Allow only one user at a time
- --readonly Safeguard database
- --set <option>=<value> Set configuration option
- --help Print this list of options
- --version Print version and compile time info
-The debug, testing & trace options:
- --algorithms
- --forcemito
- --heaps
- --io
- --memory
- --modules
- --performance
- --properties
- --threads
- --transactions
- --debug=<bitmask>
-
-# 10:03:11 >
-# 10:03:11 > Done.
-# 10:03:11 >
-
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.out
b/monetdb5/tools/Tests/mserver5--help.stable.out
deleted file mode 100644
--- a/monetdb5/tools/Tests/mserver5--help.stable.out
+++ /dev/null
@@ -1,17 +0,0 @@
-stdout of test 'mserver5--help` in directory 'monetdb5/tools` itself:
-
-
-# 16:36:12 >
-# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help
-# 16:36:12 >
-
-
-# 16:36:12 >
-# 16:36:12 > Mtimeout -timeout 60 mserver5 --config= --help
-# 16:36:12 >
-
-
-# 10:03:11 >
-# 10:03:11 > Done.
-# 10:03:11 >
-
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -49,7 +49,7 @@ static str monetdb_query(Client c, str q
str retval;
mvc* m = ((backend *) c->sqlcontext)->mvc;
res_table* res = NULL;
- int i;
+
retval = SQLstatementIntern(c, query, "name", 1, 0, &res);
if (retval == MAL_SUCCEED)
retval = SQLautocommit(m);
@@ -61,11 +61,11 @@ static str monetdb_query(Client c, str q
}
if (res) {
// print result columns
- printf("%s (", res->cols->tn);
- for(i = 0; i < res->nr_cols; i++) {
- printf("%s", res->cols[i].name);
- printf(i + 1 == res->nr_cols ? ")\n" : ",");
- }
+// printf("%s (", res->cols->tn);
+// for(int i = 0; i < res->nr_cols; i++) {
+// printf("%s", res->cols[i].name);
+// printf(i + 1 == res->nr_cols ? ")\n" : ",");
+// }
SQLdestroyResult(res);
}
return MAL_SUCCEED;
@@ -312,16 +312,16 @@ int main(int argc, char **argv) {
monetdb_query(c, "CREATE TABLE temporary_table(i INTEGER);");
monetdb_query(c, "INSERT INTO temporary_table VALUES (3), (4);");
monetdb_disconnect(c);
- printf("Successfully initialized MonetDB.\n");
+// printf("Successfully initialized MonetDB.\n");
for(i = 0; i < 10; i++) {
monetdb_shutdown();
- printf("Successfully shutdown MonetDB.\n");
+// printf("Successfully shutdown MonetDB.\n");
retval = monetdb_initialize();
if (retval != MAL_SUCCEED) {
printf("Failed MonetDB restart: %s\n", retval);
return -1;
}
- printf("Successfully restarted MonetDB.\n");
+// printf("Successfully restarted MonetDB.\n");
c = (Client) monetdb_connect();
monetdb_query(c, "SELECT * FROM temporary_table;");
monetdb_query(c, "DROP TABLE temporary_table;");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
