Changeset: 93ac182cd8e6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93ac182cd8e6
Added Files:
clients/Tests/exports.stable.err-noapprove
clients/Tests/exports.stable.out-noapprove
clients/Tests/malcheck.stable.err-noapprove
clients/Tests/malcheck.stable.out-noapprove
Modified Files:
testing/Mtest.py.in
Branch: Dec2016
Log Message:
Refuse to approve tests when there is a .stable.{out,err}-noapprove file.
This should help against accidental approvals.
diffs (25 lines):
diff --git a/clients/Tests/exports.stable.err-noapprove
b/clients/Tests/exports.stable.err-noapprove
new file mode 100644
diff --git a/clients/Tests/exports.stable.out-noapprove
b/clients/Tests/exports.stable.out-noapprove
new file mode 100644
diff --git a/clients/Tests/malcheck.stable.err-noapprove
b/clients/Tests/malcheck.stable.err-noapprove
new file mode 100644
diff --git a/clients/Tests/malcheck.stable.out-noapprove
b/clients/Tests/malcheck.stable.out-noapprove
new file mode 100644
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1374,6 +1374,13 @@ def ApproveOutput (env, TST) :
proc.wait()
f.close()
if os.path.getsize(patch + ".0"):
+ # if a file TST.stable.{out,err}-noapprove exists, we
+ # refuse to approve the output by (silently) skipping
+ if os.path.isfile(TSTSRCDIRTST + '.stable.' + WHAT +
'-noapprove'):
+ remove(patch + ".0")
+ if verbose:
+ print("NOT approving %s -> stable.%s%s" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM))
+ continue
if not verbose:
oc = ''
print("Approving %s -> stable.%s%s%s" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM, oc))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
