Changeset 0b6c1c9 for tests

Timestamp:

May 7, 2024, 7:04:31 PM (7 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

6d9aa79

Parents:

c333ed2 (diff), 083e637 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -120 +120 @@
                 return (False, "'file EXPECT' failed with code {} '{}'".format(code, err))
 
-        match = re.search(".*: (.*)", out)
+        match = re.search(r".*: (.*)", out)
 
         if not match:
@@ -306 +306 @@
                 sys.exit(1)
 
-        re_jobs = re.search("--jobserver-(auth|fds)", out)
+        re_jobs = re.search(r"--jobserver-(auth|fds)", out)
         if not re_jobs:
                 print("ERROR: cannot find Makefile jobserver version", file=sys.stderr)

tests/test.py

@@ -23 +23 @@
 
         def match_test(path):
-                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_\+]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
+                match = re.search(r'^%s\/([\w\/\-_]*).expect\/([\w\-_\+]+)(\.[\w\-_]+)?\.txt$' % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -359 +359 @@
                                 sys.exit(1)
 
-                        print(' '.join(re.findall('([^\s]+\.cfa)', out)), end=' ')
+                        print(' '.join(re.findall(r'([^\s]+\.cfa)', out)), end=' ')
 
                 print('')