Changeset: 3eadb66f8993 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3eadb66f8993
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (24 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1387,12 +1387,15 @@ def ApproveOutput (env, TST) :
list = []
for f in os.listdir(dir or os.curdir):
if f != thefile and test.match(f):
- list.append(f)
+ remove(os.path.join(dir or os.curdir, f + '.rej'))
+ remove(os.path.join(dir or os.curdir, f + '.orig'))
+ proc = process.Popen(['patch', '--forward',
os.path.join(dir or os.curdir, f)], stdin = open(patch))
+ proc.wait()
+ if os.path.exists(os.path.join(dir or os.curdir, f +
'.rej')):
+ list.append(f)
if len(list) > 0:
- Warn('There are other (specific) stable outputs for test
%s:\n %s' % (os.path.join(TSTDIR,'Tests',TST), str(list)))
- STDERR.write(' To propagate the changes that were just made
in %s\n' % os.path.join(TSTDIR,'Tests',thefile))
- STDERR.write(' to the other (specific) stable outputs,\n')
- STDERR.write(' simply apply the patch in %s to them.\n\n' %
patch)
+ Warn('There are other (specific) stable outputs for test
%s\nfor which patching failed:\n %s' % (os.path.join(TSTDIR,'Tests',TST),
str(list)))
+ STDERR.write(' Look at the *.rej files in directory %s.\n\n'
% os.path.join(TSTDIR,'Tests'))
STDERR.flush()
else:
i = TST.rfind('.')
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
