Changes in src/tests/pybin/settings.py [f3b9efc:552f5cb]

File:

• src/tests/pybin/settings.py (modified) (4 diffs)

src/tests/pybin/settings.py

@@ +1 @@
+from __future__ import print_function
+
+import os
 import sys
+
+try :
+        sys.path.append(os.getcwd())
+        import config
+
+        SRCDIR = os.path.abspath(config.SRCDIR)
+        BUILDDIR = os.path.abspath(config.BUILDDIR)
+except:
+        print('ERROR: missing config.py, re-run configure script.', file=sys.stderr)
+        sys.exit(1)
 
 class Architecture:
@@ -5 +18 @@
                 'x64'                   : 'x64',
                 'x86-64'                : 'x64',
+                'x86_64'                : 'x64',
                 'x86'                   : 'x86',
                 'i386'          : 'x86',
@@ -25 +39 @@
                         self.cross_compile = False
                         try:
-                                arch = machine_default()
+                                arch = config.HOSTARCH
                                 self.target = Architecture.makeCanonical( arch )
                         except KeyError:
@@ -66 +80 @@
         arch       = Architecture(options.arch)
 
+
 def updateMakeCmd(force, jobs):
         global make
 
         make = "make" if not force else ("make -j%i" % jobs)
-
-
-def set_machine_default( func ):
-        global machine_default
-
-        machine_default = func