Changeset: ed55090e88cc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed55090e88cc Added Files: clients/mapiclient/Tests/tachograph--help clients/mapiclient/Tests/tachograph--help.bat clients/mapiclient/Tests/tachograph--help.stable.err clients/mapiclient/Tests/tachograph--help.stable.out Modified Files: clients/mapiclient/Tests/All sql/test/mergetables/Tests/All sql/test/mergetables/Tests/doubletable.sql sql/test/mergetables/Tests/mergedrop.sql Branch: resultset Log Message:
Merge with default branch. diffs (110 lines): diff --git a/clients/mapiclient/Tests/All b/clients/mapiclient/Tests/All --- a/clients/mapiclient/Tests/All +++ b/clients/mapiclient/Tests/All @@ -2,3 +2,4 @@ mclient--help msqldump--help stethoscope--help tomograph--help +tachograph--help diff --git a/clients/mapiclient/Tests/tachograph--help b/clients/mapiclient/Tests/tachograph--help new file mode 100755 --- /dev/null +++ b/clients/mapiclient/Tests/tachograph--help @@ -0,0 +1,3 @@ +#!/bin/sh + +Mlog -x $MTIMEOUT tachograph --help diff --git a/clients/mapiclient/Tests/tachograph--help.bat b/clients/mapiclient/Tests/tachograph--help.bat new file mode 100755 --- /dev/null +++ b/clients/mapiclient/Tests/tachograph--help.bat @@ -0,0 +1,4 @@ +@echo on +@prompt # $t $g + + %MTIMEOUT% tachograph --help diff --git a/clients/mapiclient/Tests/tachograph--help.stable.err b/clients/mapiclient/Tests/tachograph--help.stable.err new file mode 100644 --- /dev/null +++ b/clients/mapiclient/Tests/tachograph--help.stable.err @@ -0,0 +1,27 @@ +stderr of test 'tachograph--help` in directory 'clients/mapiclient` itself: + + +# 11:43:47 > +# 11:43:47 > Mtimeout -timeout 120 ./tachograph--help tachograph--help +# 11:43:47 > + + +# 10:36:09 > +# 10:36:09 > Mtimeout -timeout 60 tachograph --help +# 10:36:09 > + +tachograph [options] + -d | --dbname=<database_name> + -u | --user=<user> + -p | --port=<portnr> + -h | --host=<hostname> + -b | --beat=<delay> in milliseconds (default 5000) + -i | --interactive=<o | 1> show trace on stdout + -o | --output=<webfile> + -w | --wait=<delay time> in milliseconds + -? | --help + +# 23:54:13 > +# 23:54:13 > "Done." +# 23:54:13 > + diff --git a/clients/mapiclient/Tests/tachograph--help.stable.out b/clients/mapiclient/Tests/tachograph--help.stable.out new file mode 100644 --- /dev/null +++ b/clients/mapiclient/Tests/tachograph--help.stable.out @@ -0,0 +1,17 @@ +stdout of test 'tachograph--help` in directory 'clients/mapiclient` itself: + + +# 11:43:47 > +# 11:43:47 > Mtimeout -timeout 120 ./tachograph--help tachograph--help +# 11:43:47 > + + +# 11:43:47 > +# 11:43:47 > Mtimeout -timeout 60 tachograph --help +# 11:43:47 > + + +# 11:43:47 > +# 11:43:47 > Done. +# 11:43:47 > + diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All --- a/sql/test/mergetables/Tests/All +++ b/sql/test/mergetables/Tests/All @@ -9,5 +9,5 @@ doubletable forex forex1 mergedrop -mergekey +mergekey crash0 diff --git a/sql/test/mergetables/Tests/doubletable.sql b/sql/test/mergetables/Tests/doubletable.sql --- a/sql/test/mergetables/Tests/doubletable.sql +++ b/sql/test/mergetables/Tests/doubletable.sql @@ -10,6 +10,6 @@ ALTER TABLE complete ADD TABLE part2; ALTER TABLE complete ADD TABLE part1; ALTER TABLE complete ADD TABLE part2; +DROP TABLE complete; DROP TABLE part1; DROP TABLE part2; -DROP TABLE complete; diff --git a/sql/test/mergetables/Tests/mergedrop.sql b/sql/test/mergetables/Tests/mergedrop.sql --- a/sql/test/mergetables/Tests/mergedrop.sql +++ b/sql/test/mergetables/Tests/mergedrop.sql @@ -26,3 +26,6 @@ DROP TABLE part2; SELECT * FROM COMPLETE; DROP TABLE complete; + +DROP TABLE part2; +DROP TABLE part1; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
