Changeset: 17b377f382f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17b377f382f0
Modified Files:
testing/Mfilter.py.in
testing/MkillUsers.in
testing/quicktest
Branch: default
Log Message:
removed more M4/PF/XQ legacy in testing/
diffs (103 lines):
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -50,8 +50,6 @@
# MAPI & XRPC port numbers
r"^MAPI = .*@.*:[0-9]*$",
r'^QUERY = execute at { ".*:[0-9]*" }$',
- # Pathfinder revision number (`pf -{h,H}` in
pathfinder/compiler/Tests/usage{,H}*)
- r"^Pathfinder XQuery Compiler \(.Revision: .* .\)$",
# Tokens depend on flex/bison
r'^\[ "TOK_[A-Z]+",\t* +"int",\t* +"frozen",\t*
+"constant",\t* +"[0-9]+"\t* +\]',
# ignore big- vs. little-endian byte-orders in test
tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.*:
@@ -63,8 +61,6 @@
# `fuser` (in MkillUsers) triggers these errors on Gentoo with
"hardened" kernel
r'^! Cannot open /proc/net/unix: Permission denied$',
r'^! Cannot stat file /proc/[0-9]+/fd/[0-9]+: (?:No such
file or directory|Permission denied)$',
- # Pathfinder: extra error messages that occur only with
assertions enabled
- r'^[ \t]*!# halted in .*, line [0-9]+$',
# suspicious output/messages/errors? most probably triggered
by MkillUsers, but apparently not causing any harm:
r'^!
/.*/bin/[Mm](?:(?:server5?|apiClient|timeout|diff):e+|log:)$',
r'^! /usr/bin/mserver5: m$',
@@ -81,14 +77,10 @@
r'^\[ .*(?:,\t* ?
"?158\.765432098765(?:22|36?|44|59|64)"?)+\t* ? \]$',
# src/gdk/cast:
r'^\[ (?:\-|)0 \]$',
- # MonetDB4/src/modules/plain/Tests/mmath.milS (SunOS/Solaris:
GNU vs. Sun compiler):
- r'^\[ (?:\-|)[Ii]nfinity \]$',
# src/monet/modrefcnt1 &
tests/BugDay_2005-11-09_4.9.3/double_load_double_drop.SF-1082293 (on Itanium)
r"^!ERROR: DESCload: atom 'lock' unknown, in BAT
'[0-9]+'.$",
# Broken sql error messages:
r'^QUERY = (?:\-\-|select|insert|INSERT) ',
- # suggested alternatives in case of XQuery type errors:
- r'^type error: .*$',
# Debugging "strange" errors on Solaris x86:
"^!ERROR: interpret: no matching MIL operator to
'\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb\xdb.*$",
])+')', re.MULTILINE),
@@ -145,7 +137,6 @@
r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
# 25: 3
# r'^(ERROR = !sql_stmt symbol\()(.*)(\)->token = CREATE_SCHEMA)\n',
# 26: 3
r'^(ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo
failed: )(No .* is|.* not)( known[\. ]*)\n', # 27: 3
- r'^(
*pf:add-doc\(")(.*.pathfinder.tests.BugTracker.Tests.)(empty_file.SF-2017862-.*\.xml",".*\.xml"\).*)\n',
# 50: 3
# r'^(ERROR =| )( !ERROR: | !SQLException:assert:| !SQLException:sql:
| !SQLException:| !MALException:)([^:]+)(: *)([^ ].*)\n', # 90: 5
r'^(.*: at )(\([0-9]+,[0-9]+\-[0-9]+,[0-9]+\))(: .*)\n',
# 91: 3
# r'^(fatal error|ERROR)(: err:FORG0005, fn:exactly-one called with a
sequence containing zero or more than one item..*)()\n', # 99: 3
@@ -180,7 +171,6 @@
None, 'localhost', None,
# 25: 3
# None, '...', None,
# 26: 3
None, 'un', 'known',
# 27: 3
- None, '<path>', None,
# 50: 3
# None, ' !ERROR', '', ': ', None,
# 90: 5
None, '...', None,
# 91: 3
# '=ERROR', None, '\n#',
# 99: 3
diff --git a/testing/MkillUsers.in b/testing/MkillUsers.in
--- a/testing/MkillUsers.in
+++ b/testing/MkillUsers.in
@@ -70,22 +70,18 @@
if [ "$MONETDB_PREFIX" ] ; then BINPATH="$BINPATH
$MONETDB_PREFIX/bin" ; fi
if [ "$TESTING_PREFIX" ] ; then BINPATH="$BINPATH
$TESTING_PREFIX/bin" ; fi
if [ "$CLIENTS_PREFIX" ] ; then BINPATH="$BINPATH
$CLIENTS_PREFIX/bin" ; fi
- if [ "$MONETDB4_PREFIX" ] ; then BINPATH="$BINPATH
$MONETDB4_PREFIX/bin" ; fi
if [ "$MONETDB5_PREFIX" ] ; then BINPATH="$BINPATH
$MONETDB5_PREFIX/bin" ; fi
fi
if [ "$TEMPLATE_PREFIX" ] ; then BINPATH="$BINPATH $TEMPLATE_PREFIX/bin" ;
fi
if [ "$SQL_PREFIX" ] ; then BINPATH="$BINPATH $SQL_PREFIX/bin" ;
fi
if [ "$GEOM_PREFIX" ] ; then BINPATH="$BINPATH $GEOM_PREFIX/bin" ;
fi
if [ "$DATACELL_PREFIX" ] ; then BINPATH="$BINPATH $DATACELL_PREFIX/bin" ;
fi
-if [ "$PATHFINDER_PREFIX" ] ; then BINPATH="$BINPATH $PATHFINDER_PREFIX/bin" ;
fi
if [ "$MONETDB_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB_BUILD/src/tools $MONETDB_BUILD/src/tools/.libs" ; fi
if [ "$CLIENTS_BUILD" ] ; then BINPATH="$BINPATH
$CLIENTS_BUILD/src/mapiclient $CLIENTS_BUILD/src/mapiclient/.libs
$CLIENTS_BUILD/src/python" ; fi
-if [ "$MONETDB4_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB4_BUILD/src/tools $MONETDB4_BUILD/src/tools/.libs" ; fi
if [ "$MONETDB5_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB5_BUILD/src/tools $MONETDB5_BUILD/src/tools/.libs" ; fi
if [ "$TEMPLATE_BUILD" ] ; then BINPATH="$BINPATH
$TEMPLATE_BUILD/src/tools $TEMPLATE_BUILD/src/tools/.libs" ; fi
if [ "$SQL_BUILD" ] ; then BINPATH="$BINPATH
$SQL_BUILD/src/tools $SQL_BUILD/src/tools/.libs" ; fi
if [ "$GEOM_BUILD" ] ; then BINPATH="$BINPATH
$GEOM_BUILD/src/tools $GEOM_BUILD/src/tools/.libs" ; fi
-if [ "$PATHFINDER_BUILD" ] ; then BINPATH="$BINPATH
$PATHFINDER_BUILD/src/tools $PATHFINDER_BUILD/src/tools/.libs
$PATHFINDER_BUILD/compiler $PATHFINDER_BUILD/compiler/.libs" ; fi
if [ "$DATACELL_BUILD" ] ; then BINPATH="$BINPATH
$DATACELL_BUILD/src/tools $DATACELL_BUILD/src/tools/.libs" ; fi
for b in $BINPATH ; do
files="$files `ls $b/* 2>/dev/null | egrep
'/(lt-)?(mserver5|Mserver|mclient|mclient\.py|Mdiff|Mlog|Mtimeout|pf|actuator|sensor)$'`"
diff --git a/testing/quicktest b/testing/quicktest
--- a/testing/quicktest
+++ b/testing/quicktest
@@ -117,7 +117,6 @@
case ${repo} in
MonetDB/*) rmpath=${repo#MonetDB} ;;
clients/*) rmpath=${repo#clients} ;;
- MonetDB4/*) rmpath=${repo#MonetDB4} ;;
MonetDB5/*) rmpath=${repo#MonetDB5} ;;
sql/*) rmpath=${repo#sql} ;;
geom/*) rmpath=${repo#geom} ;;
@@ -149,13 +148,6 @@
return 0
fi
fi
- if type -p monetdb4-config > /dev/null ; then
- spath=$(monetdb4-config --source)
- if [[ ${path} == ${spath}/* ]] ; then
- echo "${spath}"
- return 0
- fi
- fi
if type -p monetdb5-config > /dev/null ; then
spath=$(monetdb5-config --source)
if [[ ${path} == ${spath}/* ]] ; then
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
