Changeset: 91e5ac669666 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91e5ac669666
Modified Files:
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (76 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -170,6 +170,12 @@ def splitcommand(cmd):
del command[0]
return command
+def remove(file):
+ try:
+ os.remove(file)
+ except:
+ pass
+
def isexecutable(TST, ext = '.sh') :
if os.name == "nt":
for ext in ".exe", ".com", ".bat", ".cmd":
@@ -1142,10 +1148,7 @@ def PerformDir(env, testdir, testlist, B
if testweb:
os.chdir(TSTTRGDIR)
for f in alllinks:
- try:
- os.remove(f)
- except:
- pass
+ remove(f)
if THISFILE == "Mtest.py":
if not testweb:
@@ -1172,7 +1175,7 @@ def PerformDir(env, testdir, testlist, B
if fnmatch.fnmatch(f, pat):
break
else:
- os.remove(ff)
+ remove(ff)
if testweb:
try:
@@ -1270,11 +1273,11 @@ def ApproveOutput (env, TST) :
proc = subprocess.Popen(['diff', '-u', stableOUTPUT + '.ORG',
stableOUTPUT], stdout = f)
proc.wait()
f.close()
- os.remove(stableOUTPUT + ".ORG")
- os.remove(patch + ".1")
+ remove(stableOUTPUT + ".ORG")
+ remove(patch + ".1")
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)
- os.remove(patch + ".0")
+ remove(patch + ".0")
thefile = os.path.split(stableOUTPUT)[1]
dir,file = os.path.split(stableOUT)
@@ -2107,10 +2110,7 @@ def RunTest(env, TST, BusyPorts, COND, o
'%s.server.err' % TST, '%s.client.err' % TST,
'%s.test.err.FILTERED' % TST,
'%s%s.FILTERED' % (TST, STABLEerr)]:
- try:
- os.remove(f)
- except:
- pass
+ remove(f)
if not testweb:
elem = AddTstToHtmlIndex(env, TST, STABLEout, STABLEerr, EXT,
@@ -3652,10 +3652,7 @@ def main(argv) :
# some more cleanup
# note that we create the file so that os.removedirs in PerformDir
# doesn't remove os.path.join(TSTTRGBASE, TSTPREF)
- try:
- os.remove(os.path.join(TSTTRGBASE, TSTPREF, '.Mapprove.rc'))
- except:
- pass
+ remove(os.path.join(TSTTRGBASE, TSTPREF, '.Mapprove.rc'))
fn = os.path.join(TSTTRGBASE, TSTPREF, "times.")
fl = open(fn+"lst","w")
Failure = [[] for i in range(len(FAILURES))]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
