Changeset 41af19c for tests/pybin

Timestamp:

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

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, 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

Location:

tests/pybin

Files:

• settings.py (modified) (2 diffs)
• test_run.py (modified) (1 diff)

tests/pybin/settings.py

@@ -23 +23 @@
 class Architecture:
         KnownArchitectures = {
-                'x64'           : 'x64',
-                'x86-64'        : 'x64',
-                'x86_64'        : 'x64',
-                'x86'           : 'x86',
-                'aarch64'       : 'arm',
-                'i386'          : 'x86',
-                'i486'          : 'x86',
-                'i686'          : 'x86',
-                'Intel 80386'   : 'x86',
-                'arm'           : 'arm',
-                'ARM'           : 'arm',
+                'x64'         : 'x64',
+                'x86-64'      : 'x64',
+                'x86_64'      : 'x64',
+                'x86'         : 'x86',
+                'aarch64'     : 'arm',
+                'i386'        : 'x86',
+                'i486'        : 'x86',
+                'i686'        : 'x86',
+                'Intel 80386' : 'x86',
+                'arm'         : 'arm',
+                'ARM'         : 'arm',
         }
 
@@ -129 +129 @@
         global timeout2gdb
 
-        all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))]
+        all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))] if options.arch else [Architecture(None)]
         all_debug    = [Debug(o)        for o in list(dict.fromkeys(options.debug  ))]
         all_install  = [Install(o)      for o in list(dict.fromkeys(options.install))]

tests/pybin/test_run.py

@@ -45 +45 @@
 
         @classmethod
-        def from_target(_, target):
+        def new_target(_, target, arch):
                 test = Test()
                 test.name = os.path.basename(target)
                 test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
-                test.arch = settings.arch.target if settings.arch.cross_compile else ''
+                test.arch = arch.target if arch else ''
                 return test