Changeset d0c91a6 for tests/test.py

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into jenkins-sandbox

File:

• tests/test.py (modified) (2 diffs)

tests/test.py

@@ -19 +19 @@
 
         def matchTest(path):
-                match = re.search("%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt" % settings.SRCDIR, path)
+                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -34 +34 @@
 # reads the directory ./.expect and indentifies the tests
 def listTests( includes, excludes ):
-        includes = [canonicalPath( i ) for i in includes] if includes else None
-        excludes = [canonicalPath( i ) for i in excludes] if excludes else None
-
         # tests directly in the .expect folder will always be processed
         test_list = findTests()