Changeset: e044979fe073 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e044979fe073
Modified Files:
testing/Mfilter.py
testing/Mtest.py.in
Branch: default
Log Message:
Ignore lines starting with "| #" as well as lines starting with "#".
diffs (38 lines):
diff --git a/testing/Mfilter.py b/testing/Mfilter.py
--- a/testing/Mfilter.py
+++ b/testing/Mfilter.py
@@ -119,6 +119,22 @@ elemre = re.compile(r'<[-:a-zA-Z_0-9]+(?
# we're only interested in elements with attributes, hence the +^
def mFilter (FILE, IGNORE) :
+ # translate a pattern suitable for diff to one suitable for re
+ # this is pretty simple-minded and does not do everything that
+ # might be needed
+ ign = []
+ i = 0
+ while i < len(IGNORE):
+ if IGNORE[i] == '\\':
+ i += 1
+ if IGNORE[i] not in '()|':
+ ign.append('\\')
+ elif IGNORE[i] in '()|':
+ ign.append('\\')
+ ign.append(IGNORE[i])
+ i += 1
+ IGNORE = ''.join(ign)
+
fin = open(FILE, "rU")
LINE = fin.readline()
while len(LINE) and ( len(LINE) < 15 or LINE[:15] not in ("stdout of
test ", "stderr of test ") ):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3224,7 +3224,7 @@ def ReadMapproveRc(f) :
THISFILE = os.path.basename(sys.argv[0])
THISPATH = os.path.realpath(os.path.dirname(sys.argv[0]))
-dftIGNORE = '^#'
+dftIGNORE = r'^\(| \|\)#'
TSTDBG = str(2+8)
TSTTHREADS = "0"
dftTSTPREF = "mTests"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
