Changeset f3b9efc for src/tests/test.py

Timestamp:

Dec 5, 2017, 1:29:12 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

86ad276

Parents:

099a40d

Message:

Tests now properly work with multiple architectures

File:

• src/tests/test.py (modified) (8 diffs)

src/tests/test.py

@@ -17 +17 @@
         expected = []
 
-        def findTest(path):
+        def matchTest(path):
                 match = re.search("(\.[\w\/\-_]*)\/.expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt", path)
                 if match :
@@ -24 +24 @@
                         test.path = match.group(1)
                         test.arch = match.group(3)[1:] if match.group(3) else None
-                        expected.append(test)
-
-        pathWalk( findTest )
+                        if settings.arch.match(test.arch):
+                                expected.append(test)
+
+        pathWalk( matchTest )
 
         return expected
@@ -77 +78 @@
 
         # make sure we have at least some test to run
-        if tests :
+        if not tests :
                 print('ERROR: No valid test to run', file=sys.stderr)
                 sys.exit(1)
@@ -139 +140 @@
         )
 
-        retcode = 0
-        error = None
-
         # if the make command succeds continue otherwise skip to diff
         if make_ret == 0 or settings.dry_run:
@@ -149 +147 @@
                 else :
                         # simply cat the result into the output
-                        sh("cat %s > %s" % (test.target(), out_file))
+                        retcode, _ = sh("cat %s > %s" % (test.target(), out_file))
         else:
-                sh("mv %s %s" % (err_file, out_file))
+                retcode, _ = sh("mv %s %s" % (err_file, out_file))
 
 
@@ -161 +159 @@
                                 error = "\t\tNo make target for test %s!" % test.target()
                                 sh("rm %s" % out_file, False)
+                        else:
+                                error = None
                 else :
                         # fetch return code and error from the diff command
@@ -250 +250 @@
                 tests = allTests
 
+        #otherwise we need to validate that the test list that was entered is valid
         else :
-                #otherwise we need to validate that the test list that was entered is valid
                 tests = validTests( options )
 
         # sort the test alphabetically for convenience
-        tests.sort(key=lambda t: t.target())
+        tests.sort(key=lambda t: (t.arch if t.arch else '') + t.target())
 
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --all --regenerate-expected -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))
 
         elif options.list :
-                print("Listing for %s:%s"% (settings.arch.toString(), settings.debug))
+                print("Listing for %s:%s"% (settings.arch.string, settings.debug.string))
                 print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
 
@@ -272 +272 @@
                 print('%s (%s:%s) on %i cores' % (
                         'Regenerate tests' if settings.generating else 'Running',
-                        settings.arch.toString(),
-                        settings.debug,
+                        settings.arch.string,
+                        settings.debug.string,
                         options.jobs
                 ))