Changeset 575a6e5 for tests

Timestamp:

Aug 9, 2018, 11:07:05 AM (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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

7a7ab42

Parents:

a5121bf

Message:

Cross compilation appears to be working

Location:

tests

Files:

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

tests/Makefile.am

@@ -33 +33 @@
         -DIN_DIR="${srcdir}/.in/"
 
-AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS}
+AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
 
 CC = @CFACC@
@@ -59 +59 @@
 
 .validate: .validate.c
-        @$(COMPILE) .validate.c -fsyntax-only
+        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
 
 .validate.c:

tests/Makefile.in

@@ -304 +304 @@
 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
         -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" ${DEBUG_FLAGS} \
-        ${INSTALL_FLAGS}
+        ${INSTALL_FLAGS} ${ARCH_FLAGS}
 fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
@@ -625 +625 @@
 
 .validate: .validate.c
-        @$(COMPILE) .validate.c -fsyntax-only
+        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
 
 .validate.c:

tests/pybin/settings.py

@@ -29 +29 @@
         }
 
+        CrossCompileFlags = {
+                'x64' : 'ARCH_FLAGS=-m64',
+                'x86' : 'ARCH_FLAGS=-m32',
+        }
+
         def __init__(self, arch):
+                try:
+                        canonical_host = Architecture.makeCanonical( config.HOSTARCH )
+                except KeyError:
+                        print("Unkown host architecture %s" % config.HOSTARCH, file=sys.stderr)
+                        sys.exit(1)
+
                 if arch:
+                        try:
+                                arch = Architecture.makeCanonical( arch )
+                        except KeyError:
+                                print("Unkown architecture %s" % arch, file=sys.stderr)
+                                sys.exit(1)
+
+                if arch and arch != canonical_host:
+                        self.target = arch
                         self.cross_compile = True
-                        try:
-                                self.target = Architecture.makeCanonical( arch )
+                        try :
+                                self.flags = Architecture.CrossCompileFlags[arch]
                         except KeyError:
-                                print("Unkown architecture %s" % arch)
+                                print("Cross compilation not available for architecture %s" % arch, file=sys.stderr)
                                 sys.exit(1)
+
                 else:
+                        self.target = canonical_host
                         self.cross_compile = False
-                        try:
-                                arch = config.HOSTARCH
-                                self.target = Architecture.makeCanonical( arch )
-                        except KeyError:
-                                print("Running on unkown architecture %s" % arch)
-                                sys.exit(1)
+                        self.flags = ""
 
                 self.string = self.target
@@ -65 +81 @@
         def __init__(self, value):
                 self.string = "debug" if value else "no debug"
-                self.flags  = """DEBUG_FLAGS="%s" """ % ("-debug" if value else "-nodebug")
+                self.flags  = """DEBUG_FLAGS="%s" """ % ("-debug -O0" if value else "-nodebug -O2")
 
 class Install:
@@ -98 +114 @@
                 with open (".validate.err", "r") as myfile:
                         error=myfile.read()
-                print('ERROR: Invalid configuration', file=sys.stderr)
+                print("ERROR: Invalid configuration %s:%s" % (arch.string, debug.string), file=sys.stderr)
                 print("       verify returned : \n%s" % error, file=sys.stderr)
                 tools.rm("%s/.validate.err" % BUILDDIR)

tests/pybin/tools.py

@@ -101 +101 @@
                 '-s' if silent else '',
                 test_param,
+                settings.arch.flags,
                 settings.debug.flags,
                 settings.install.flags,

tests/test.py

@@ -98 +98 @@
         parser.add_argument('tests', metavar='test', type=str, nargs='*', help='a list of tests to run')
 
-        options =  parser.parse_args()
+        try:
+                options =  parser.parse_args()
+        except:
+                print('ERROR: invalid arguments', file=sys.stderr)
+                parser.print_help(sys.stderr)
+                sys.exit(1)
 
         # script must have at least some tests to run or be listing