Changeset 41af19c for tests/test.py

Timestamp:

Apr 16, 2020, 12:00:42 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7215000, 9a7c88f

Parents:

1c412aa

Message:

Fixed regenerate-expected with respect to new multi-arch feature

File:

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

tests/test.py

@@ -67 +67 @@
                 for testname in options.tests :
                         testname = canonical_path( testname )
+                        # first check if this is a valid name to regenerate
                         if Test.valid_name(testname):
+                                # this is a valid name, let's check if it already exists
                                 found = [test for test in all_tests if canonical_path( test.target() ) == testname]
-                                tests.append( found[0] if len(found) == 1 else Test.from_target(testname) )
+                                if not found:
+                                        # it's a new name, create it according to the name and specified architecture
+                                        if options.arch:
+                                                # user specified one or multiple architectures, assume the tests will have architecture specific results
+                                                tests.extend( [Test.new_target(testname, arch) for arch in settings.all_arch] )
+                                        else:
+                                                # user didn't specify an architecture, just create a cross platform test
+                                                tests.append( Test.new_target( testname, None ) )
+                                elif len(found) == 1 and not found[0].arch:
+                                        # we found a single test, the user better be wanting to create a cross platform test
+                                        if options.arch:
+                                                print('ERROR: "%s", test has no specified architecture but --arch was specified, ignoring it' % testname, file=sys.stderr)
+                                        else:
+                                                tests.append( found[0] )
+                                else:
+                                        # this test is already cross platform, just add a test for each platform the user asked
+                                        tests.extend( [Test.new_target(testname, arch) for arch in settings.all_arch] )
+
+                                        # print a warning if it users didn't ask for a specific architecture
+                                        if not options.arch:
+                                                print('WARNING: "%s", test has architecture specific expected files but --arch was not specified, regenerating only for current host' % testname, file=sys.stderr)
+
                         else :
                                 print('ERROR: "%s", tests are not allowed to end with a C/C++/CFA extension, ignoring it' % testname, file=sys.stderr)
@@ -91 +114 @@
         parser.add_argument('--debug', help='Run all tests in debug or release', type=comma_separated(yes_no), default='yes')
         parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=comma_separated(yes_no), default='no')
-        parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default='')
+        parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default=None)
         parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
         parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)