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

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:
@@ -18 +5 @@
                 'x64'                   : 'x64',
                 'x86-64'                : 'x64',
-                'x86_64'                : 'x64',
                 'x86'                   : 'x86',
                 'i386'          : 'x86',
@@ -39 +25 @@
                         self.cross_compile = False
                         try:
-                                arch = config.HOSTARCH
+                                arch = machine_default()
                                 self.target = Architecture.makeCanonical( arch )
                         except KeyError:
@@ -80 +66 @@
         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