Changeset f3b9efc for src/tests/pybin/tools.py

Timestamp:

Dec 5, 2017, 1:29:12 PM (7 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/pybin/tools.py (modified) (4 diffs)

src/tests/pybin/tools.py

@@ -76 +76 @@
                 '-s' if silent else '',
                 test_param,
-                settings.debugFlag,
+                settings.debug.flags,
                 flags,
                 target,
@@ -147 +147 @@
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
-        return 'x64'
         sh('echo "void ?{}(int&a,int b){}int main(){return 0;}" > .dummy.c')
         ret, out = make('.dummy', silent = True)
@@ -161 +160 @@
         rm( (".dummy.c",".dummy") )
 
-        return out
-        return re.search("ELF\s([0-9]+)-bit", out).group(1)
+        if settings.dry_run :
+                return 'x64'
+
+        return re.search(r"[^,]+,([^,]+),", out).group(1).strip()
 
 # count number of jobs to create
@@ -213 +214 @@
         raise argparse.ArgumentTypeError(msg)
         return False
+
+
+settings.set_machine_default( getMachineType )