Changeset: 3dc8b52b76fc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3dc8b52b76fc
Removed Files:
testing/MkillUsers.in
testing/Mtimeout.c
Modified Files:
MonetDB.spec
clients/mapiclient/Tests/mclient--help
clients/mapiclient/Tests/mclient--help.bat
clients/mapiclient/Tests/msqldump--help
clients/mapiclient/Tests/msqldump--help.bat
clients/mapiclient/Tests/stethoscope--help
clients/mapiclient/Tests/stethoscope--help.bat
clients/mapiclient/Tests/tachograph--help
clients/mapiclient/Tests/tachograph--help.bat
clients/mapiclient/Tests/tomograph--help
clients/mapiclient/Tests/tomograph--help.bat
debian/monetdb-testing.install
monetdb5/tools/Tests/mserver5--help
monetdb5/tools/Tests/mserver5--help.bat
sql/backends/monet5/Tests/Mbeddedsql5--help
sql/backends/monet5/Tests/Mbeddedsql5--help.bat
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
sql/test/Tests/bogus-auto-generated-keys.SQL.sh
sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
testing/ChangeLog
testing/Makefile.ag
testing/Mtest.py.in
testing/README
testing/process.py
Branch: default
Log Message:
Removed helper programs Mtimeout and MkillUsers.
They haven't been used for a long time.
diffs (truncated from 805 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -854,9 +854,7 @@ developer. If you do want to test, inst
%license COPYING
%defattr(-,root,root)
%{_bindir}/Mdiff
-%{_bindir}/MkillUsers
%{_bindir}/Mlog
-%{_bindir}/Mtimeout
%package testing-python
Summary: MonetDB - Monet Database Management System
diff --git a/clients/mapiclient/Tests/mclient--help
b/clients/mapiclient/Tests/mclient--help
--- a/clients/mapiclient/Tests/mclient--help
+++ b/clients/mapiclient/Tests/mclient--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT mclient --help
+Mlog -x mclient --help
diff --git a/clients/mapiclient/Tests/mclient--help.bat
b/clients/mapiclient/Tests/mclient--help.bat
--- a/clients/mapiclient/Tests/mclient--help.bat
+++ b/clients/mapiclient/Tests/mclient--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% mclient --help
+ mclient --help
diff --git a/clients/mapiclient/Tests/msqldump--help
b/clients/mapiclient/Tests/msqldump--help
--- a/clients/mapiclient/Tests/msqldump--help
+++ b/clients/mapiclient/Tests/msqldump--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT msqldump --help
+Mlog -x msqldump --help
diff --git a/clients/mapiclient/Tests/msqldump--help.bat
b/clients/mapiclient/Tests/msqldump--help.bat
--- a/clients/mapiclient/Tests/msqldump--help.bat
+++ b/clients/mapiclient/Tests/msqldump--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% msqldump --help
+ msqldump --help
diff --git a/clients/mapiclient/Tests/stethoscope--help
b/clients/mapiclient/Tests/stethoscope--help
--- a/clients/mapiclient/Tests/stethoscope--help
+++ b/clients/mapiclient/Tests/stethoscope--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT stethoscope --help
+Mlog -x stethoscope --help
diff --git a/clients/mapiclient/Tests/stethoscope--help.bat
b/clients/mapiclient/Tests/stethoscope--help.bat
--- a/clients/mapiclient/Tests/stethoscope--help.bat
+++ b/clients/mapiclient/Tests/stethoscope--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% stethoscope --help
+ stethoscope --help
diff --git a/clients/mapiclient/Tests/tachograph--help
b/clients/mapiclient/Tests/tachograph--help
--- a/clients/mapiclient/Tests/tachograph--help
+++ b/clients/mapiclient/Tests/tachograph--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT tachograph --help
+Mlog -x tachograph --help
diff --git a/clients/mapiclient/Tests/tachograph--help.bat
b/clients/mapiclient/Tests/tachograph--help.bat
--- a/clients/mapiclient/Tests/tachograph--help.bat
+++ b/clients/mapiclient/Tests/tachograph--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% tachograph --help
+ tachograph --help
diff --git a/clients/mapiclient/Tests/tomograph--help
b/clients/mapiclient/Tests/tomograph--help
--- a/clients/mapiclient/Tests/tomograph--help
+++ b/clients/mapiclient/Tests/tomograph--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT tomograph --help
+Mlog -x tomograph --help
diff --git a/clients/mapiclient/Tests/tomograph--help.bat
b/clients/mapiclient/Tests/tomograph--help.bat
--- a/clients/mapiclient/Tests/tomograph--help.bat
+++ b/clients/mapiclient/Tests/tomograph--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% tomograph --help
+ tomograph --help
diff --git a/debian/monetdb-testing.install b/debian/monetdb-testing.install
--- a/debian/monetdb-testing.install
+++ b/debian/monetdb-testing.install
@@ -1,4 +1,2 @@
debian/tmp/usr/bin/Mdiff usr/bin
-debian/tmp/usr/bin/MkillUsers usr/bin
debian/tmp/usr/bin/Mlog usr/bin
-debian/tmp/usr/bin/Mtimeout usr/bin
diff --git a/monetdb5/tools/Tests/mserver5--help
b/monetdb5/tools/Tests/mserver5--help
--- a/monetdb5/tools/Tests/mserver5--help
+++ b/monetdb5/tools/Tests/mserver5--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT mserver5 --help
+Mlog -x mserver5 --help
diff --git a/monetdb5/tools/Tests/mserver5--help.bat
b/monetdb5/tools/Tests/mserver5--help.bat
--- a/monetdb5/tools/Tests/mserver5--help.bat
+++ b/monetdb5/tools/Tests/mserver5--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% mserver5.exe --help
+ mserver5.exe --help
diff --git a/sql/backends/monet5/Tests/Mbeddedsql5--help
b/sql/backends/monet5/Tests/Mbeddedsql5--help
--- a/sql/backends/monet5/Tests/Mbeddedsql5--help
+++ b/sql/backends/monet5/Tests/Mbeddedsql5--help
@@ -1,3 +1,3 @@
#!/bin/sh
-Mlog -x $MTIMEOUT Mbeddedsql5 --help
+Mlog -x Mbeddedsql5 --help
diff --git a/sql/backends/monet5/Tests/Mbeddedsql5--help.bat
b/sql/backends/monet5/Tests/Mbeddedsql5--help.bat
--- a/sql/backends/monet5/Tests/Mbeddedsql5--help.bat
+++ b/sql/backends/monet5/Tests/Mbeddedsql5--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g
- %MTIMEOUT% Mbeddedsql5 --help
+ Mbeddedsql5 --help
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT $SQLCLIENT -h$HOST -p$MAPIPORT -d$TSTDB -i -e <
\"$TSTSRCDIR/alter_table_describe.SF-1146092-src.sql\""
+Mlog -x "$SQLCLIENT -h$HOST -p$MAPIPORT -d$TSTDB -i -e <
\"$TSTSRCDIR/alter_table_describe.SF-1146092-src.sql\""
rm -f .monetdb
diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
@@ -5,7 +5,7 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$TSTSRCDIR/not_null.SF-933194-src.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f \"$TSTSRCDIR/not_null.SF-933194-src.sql\""
rm -f .monetdb
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$TSTSRCDIR/type_dump_test.SF-989257-src.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f \"$TSTSRCDIR/type_dump_test.SF-989257-src.sql\""
rm -f .monetdb
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
@@ -5,20 +5,20 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p
$MAPIPORT -d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-data.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p $MAPIPORT -d
${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-data.sql\""
cat << EOF > .monetdb
user=voc
password=voc
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p
$MAPIPORT -d ${TSTDB} -q"
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p $MAPIPORT -d
${TSTDB} -q"
cat << EOF > .monetdb
user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p
$MAPIPORT -d ${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-drop_user.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -e -h localhost -p $MAPIPORT -d
${TSTDB} -f \"$RELSRCDIR/authorization.SF-1430616-drop_user.sql\""
rm -f .monetdb
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
--- a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
+++ b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
@@ -5,4 +5,4 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -f \"$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql\""
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
b/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/explain.SF-1739353-data.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -f \"$RELSRCDIR/explain.SF-1739353-data.sql\""
rm -f .monetdb
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -f \"$RELSRCDIR/jdbc_no_debug.SF-1739356-data.sql\""
rm -f .monetdb
diff --git a/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
b/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
--- a/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
+++ b/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$TSTSRCBASE/$TSTDIR/bogus-auto-generated-keys.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -e -f \"$TSTSRCBASE/$TSTDIR/bogus-auto-generated-keys.sql\""
rm -f .monetdb
diff --git a/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
b/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
--- a/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
+++ b/sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
@@ -5,6 +5,6 @@ user=monetdb
password=monetdb
EOF
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -e -f \"$RELSRCDIR/../except-union-intersect-bug-sf-1146079.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -e -f \"$RELSRCDIR/../except-union-intersect-bug-sf-1146079.sql\""
rm -f .monetdb
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
+++ b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
@@ -8,6 +8,6 @@ EOF
LC_ALL="`locale -a | grep -i en_us | grep -i utf | head -n 1`"
export LC_ALL
-Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d ${TSTDB} -f \"$RELSRCDIR/../unicode_varchar-bug-sf-1041324.sql\""
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -f \"$RELSRCDIR/../unicode_varchar-bug-sf-1041324.sql\""
rm -f .monetdb
diff --git a/testing/ChangeLog b/testing/ChangeLog
--- a/testing/ChangeLog
+++ b/testing/ChangeLog
@@ -1,3 +1,7 @@
# ChangeLog file for testing
# This file is updated with Maddlog
+* Tue Apr 3 2018 Sjoerd Mullender <[email protected]>
+- Removed helper programs Mtimeout and MkillUsers: they have long been
+ superseded by timeout handling by Mtest.py itself.
+
diff --git a/testing/Makefile.ag b/testing/Makefile.ag
--- a/testing/Makefile.ag
+++ b/testing/Makefile.ag
@@ -11,12 +11,6 @@ bin_Mdiff = {
LIBS = $(MALLOC_LIBS)
}
-bin_Mtimeout = {
- SOURCES = Mtimeout.c
- COND = NOT_WIN32
- LIBS = $(PTHREAD_LIBS)
-}
-
bin_Mapprove.py = bin_Mtest.py
bin_Mapprove.py.bat = NATIVE_WIN32?bin_Mtest.py.bat
@@ -41,5 +35,5 @@ scripts_sh = {
COND = NOT_WIN32
EXT = ""
DIR = bindir
- SOURCES = Mlog.in MkillUsers.in
+ SOURCES = Mlog.in
}
diff --git a/testing/MkillUsers.in b/testing/MkillUsers.in
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
