Changeset: 342ba2c0ce4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=342ba2c0ce4a
Modified Files:
testing/Mtest.py.in
Branch: Jan2014
Log Message:
Merge with Feb2013 branch.
diffs (33 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1339,7 +1339,7 @@ def ApproveOutput (env, TST) :
if os.path.getsize(patch + ".0"):
print "Approving %s -> stable.%s%s (%s file)" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM, oc)
- f = open(patch + ".1", "w")
+ f = open(patch + ".1", "wb")
for l in open(patch + ".0"):
if TO.search(l):
f.write(l[:1] + '\n')
@@ -1359,7 +1359,9 @@ def ApproveOutput (env, TST) :
sem = 1
f.flush()
f.close()
- shutil.copy(stableOUTPUT, stableOUTPUT + ".ORG")
+ o = open(stableOUTPUT).read()
+ open(stableOUTPUT + ".ORG", 'wb').write(o)
+ open(stableOUTPUT, 'wb').write(o)
proc = process.Popen(['patch', stableOUTPUT, patch + '.1'])
proc.wait()
f = open(patch, 'w')
@@ -1370,6 +1372,9 @@ def ApproveOutput (env, TST) :
f.close()
remove(stableOUTPUT + ".ORG")
remove(patch + ".1")
+ o = open(stableOUTPUT).read()
+ open(stableOUTPUT, 'w').write(o)
+ o = None
else:
print "No differences detected between %s and stable.%s%s
that are not ignored by Mtest.py." % (os.path.join(TSTDIR, "%s.test.%s" % (TST,
WHAT)), WHAT, SYSTEM)
remove(patch + ".0")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
