Changeset: b943b7040f41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b943b7040f41
Modified Files:
Branch: default
Log Message:
Merge from Dec2011 branch.
diffs (61 lines):
diff --git a/sql/test/Dump/Tests/dump.stable.out.Windows
b/sql/test/Dump/Tests/dump.stable.out.Windows
--- a/sql/test/Dump/Tests/dump.stable.out.Windows
+++ b/sql/test/Dump/Tests/dump.stable.out.Windows
@@ -83,7 +83,7 @@ CREATE TABLE "sys"."typestest" (
"character10" CHAR(10)
);
COPY 1 RECORDS INTO "sys"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 1000000 10000000000 1e+030 1.00000002e+020
1 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000 108000 120000 100000 36000
6000 2000 600 100 10 1995-07-15 07:30:00.000000
1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00
1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789"
+true 10 10000 1000000 1000000 10000000000 1e+030 1.00000002e+020
1 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000.000 108000.000
120000.000 100000.000 36000.000 6000.000 2000.000
600.000 100.000 10.000 1995-07-15 07:30:00.000000 1995-07-15
07:30:00.00000 1995-07-15 07:30:00.000000+00:00 1995-07-15
07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789"
CREATE TABLE "sys"."keytest1" (
"key1" INTEGER NOT NULL,
"key2" INTEGER NOT NULL,
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -50,6 +50,7 @@ import select
#import getpass
import Mfilter
import fnmatch
+import glob
procdebug = False
verbose = False
@@ -1861,9 +1862,35 @@ def RunTest(env, TST, BusyPorts, COND, o
# /proc/sys/kernel/core_pattern in the future but hopefully
# this value is kept sane
corefile = os.path.join(env['GDK_DBFARM'], env['TSTDB'], 'core')
- if os.path.exists(corefile):
+ if not os.path.exists(corefile):
+ corefile = None
+ # braindead engineers at RedHat decided to change the core
+ # dump name on their own (disregarding kernel settings)
+ if corefile is None:
+ corefile = os.path.join(env['GDK_DBFARM'], env['TSTDB'],
'core.*')
+ corefile = glob.glob(corefile)
+ if corefile not is None and os.path.exists(corefile[0]):
+ corefile = corefile[0]
+ else:
+ corefile = None
+ # FreeBSD uses processname.core
+ if corefile is None:
+ corefile = os.path.join(env['GDK_DBFARM'], env['TSTDB'],
'mserver5.core')
+ if not os.path.exists(corefile):
+ corefile = None
+ if corefile is not None:
try:
- os.rename(corefile, '%s-%s' % (corefile, TST))
+ os.rename(corefile, os.path.join(env['GDK_DBFARM'],
+ env['TSTDB'], 'core-%s' % (TST)))
+ except:
+ corefile = None
+ # leave a marker for TestTools
+ if corefile is None:
+ try:
+ f = open(os.path.join(env['GDK_DBFARM'], env['TSTDB'],
+ 'crash-%s' % (TST)))
+ f.write("crash without core file, or renaming it failed\n")
+ f.close()
except:
pass
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
