Changeset 552f5cb

Timestamp:

Jul 23, 2018, 4:56:25 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

cbdf565

Parents:

f85bc15

Message:

Tests now get default architecture from GNU build system instead of creating a dummy executable

Location:

src/tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• config.py.in (modified) (1 diff)
• pybin/settings.py (modified) (4 diffs)
• pybin/tools.py (modified) (2 diffs)

src/tests/Makefile.am

@@ -70 +70 @@
         @+${TEST_PY} --debug=${debug} -Iconcurrent
 
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
-
-
 % : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) -o ${@}

src/tests/Makefile.in

@@ -768 +768 @@
         @+${TEST_PY} --debug=${debug} -Iconcurrent
 
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
-
 % : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) -o ${@}

src/tests/config.py.in

@@ -7 +7 @@
 SRCDIR   = "@srcdir@"
 BUILDDIR = "@builddir@"
+HOSTARCH = "@host_cpu@"

src/tests/pybin/settings.py

@@ -6 +6 @@
 try :
         sys.path.append(os.getcwd())
-        from config import *
+        import config
 
-        SRCDIR = os.path.abspath(SRCDIR)
-        BUILDDIR = os.path.abspath(BUILDDIR)
+        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)
@@ -18 +18 @@
                 'x64'                   : 'x64',
                 'x86-64'                : 'x64',
+                'x86_64'                : 'x64',
                 'x86'                   : 'x86',
                 'i386'          : 'x86',
@@ -38 +39 @@
                         self.cross_compile = False
                         try:
-                                arch = machine_default()
+                                arch = config.HOSTARCH
                                 self.target = Architecture.makeCanonical( arch )
                         except KeyError:
@@ -84 +85 @@
 
         make = "make" if not force else ("make -j%i" % jobs)
-
-
-def set_machine_default( func ):
-        global machine_default
-
-        machine_default = func

src/tests/pybin/tools.py

@@ -170 +170 @@
 #               system
 ################################################################################
-
-# parses the Makefile to find the machine type (32-bit / 64-bit)
-def getMachineType():
-        sh('echo "void ?{}(int&a,int b){}int main(){return 0;}" > .dummy.c')
-        ret, out = make('.dummy', silent = True)
-
-        if ret != 0:
-                print("Failed to identify architecture:")
-                print(out)
-                print("Stopping")
-                rm( (".dummy.c",".dummy") )
-                sys.exit(1)
-
-        _, out = sh("file .dummy", print2stdout=False)
-        rm( (".dummy.c",".dummy") )
-
-        if settings.dry_run :
-                return 'x64'
-
-        return re.search(r"[^,]+,([^,]+),", out).group(1).strip()
-
 # count number of jobs to create
 def jobCount( options, tests ):
@@ -254 +233 @@
         else:
                 print(text)
-
-settings.set_machine_default( getMachineType )