Changeset: a007076ea078 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a007076ea078
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (52 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1292,6 +1292,7 @@ def ApproveOutput (env, TST) :
os.chdir(TSTSRCDIR)
EXTENSIONS = par['EXTENSION']
FORCE = par['FORCE']
+ NOPATCH = par['NOPATCH']
# filter = re.compile( "^!WARNING: TCPlisten\([0-9]*\): stopped.$"
"|"
# "^!WARNING: TCPepilogue: terminate [01]
listeners$", re.MULTILINE)
@@ -1381,14 +1382,15 @@ def ApproveOutput (env, TST) :
dir,file = os.path.split(stableOUT)
test = re.compile('^%s.*$' % re.escape(file))
list = []
- for f in os.listdir(dir or os.curdir):
- if f != thefile and test.match(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 not NOPATCH:
+ for f in os.listdir(dir or os.curdir):
+ if f != thefile and test.match(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\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'))
@@ -3493,6 +3495,8 @@ def main(argv) :
% (v['SYST'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['OIDS'], v['INT128'], v['SINGLE'], v['STATIC'])),
(None, 'f', 'force', None,
"force approval of error messages (i.e., lines starting with
'!')"),
+ ('nopatch', None, 'nopatch', None,
+ "do not attempt to patch other outputs"),
]
else:
options = []
@@ -3599,6 +3603,7 @@ def main(argv) :
else:
ErrXit("Extension (-x) must be one of: 'out', 'err' !")
par['FORCE'] = opts.get('force', False)
+ par['NOPATCH'] = opts.get('nopatch', False)
a = opts.get('sys')
if a is None:
par['SYSTEM'] = ''
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
