Changeset: 969453662b9d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=969453662b9d
Modified Files:
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (74 lines):
diff -r a3d0d0d7a00f -r 969453662b9d
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
Tue Oct 26 09:23:36 2010 +0200
+++
b/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
Tue Oct 26 10:51:18 2010 +0200
@@ -68,7 +68,7 @@
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = mone...@ottar:39527
+MAPI = mone...@ottar:31344
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
ERROR = !SQLException:zero_or_one:cardinality violation (51>1)
diff -r a3d0d0d7a00f -r 969453662b9d
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Tue Oct 26 09:23:36 2010 +0200
+++
b/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Tue Oct 26 10:51:18 2010 +0200
@@ -48,6 +48,9 @@
[ "mapi_clients" ]
[ "mapi_open" ]
[ "mapi_autosense" ]
+[ "default_pipe" ]
+[ "minimal_pipe" ]
+[ "sql_optimizer" ]
[ "sql_debug" ]
[ "standoff_ns" ]
[ "standoff_start" ]
@@ -59,9 +62,6 @@
[ "mal_listing" ]
[ "mero_pidfile" ]
[ "mero_controlport" ]
-[ "sql_optimizer" ]
-[ "minimal_pipe" ]
-[ "default_pipe" ]
[ "no_mitosis_pipe" ]
[ "sequential_pipe" ]
[ "nov2009_pipe" ]
diff -r a3d0d0d7a00f -r 969453662b9d testing/src/cmptests.py
--- a/testing/src/cmptests.py Tue Oct 26 09:23:36 2010 +0200
+++ b/testing/src/cmptests.py Tue Oct 26 10:51:18 2010 +0200
@@ -20,6 +20,7 @@
lst1 = os.path.join(dir1, 'times.lst')
lst2 = os.path.join(dir2, 'times.lst')
res1 = {}
+ new2 = []
for line in open(lst1):
line = line.strip().split('\t')
if res1.has_key(line[0]):
@@ -38,7 +39,7 @@
if line[0][-2:] == '/:':
continue
if not res1.has_key(line[0]):
- print 'New test in %s: %s' % (lst2, line[0])
+ new2.append(line[0])
continue
tm1, out1, err1 = res1[line[0]]
tm2, out2, err2 = tuple(line[1:])
@@ -58,11 +59,15 @@
del res1[line[0]]
if res1:
print '\nRemoved tests in %s:' % lst1
- for tst in res1:
- print tst
+ for tst in sorted(res1.keys()):
+ print tst.rstrip(':')
+ if new2:
+ print '\nNew tests in %s:' % lst2
+ for tst in sorted(new2):
+ print tst.rstrip(':')
if slowdown:
print '\nSignificant slowdown in tests:'
- for tst, tm1, tm2 in slowdown:
+ for tst, tm1, tm2 in sorted(slowdown):
print '%s %s %s' % (tst, tm1, tm2)
if __name__ == '__main__':
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
