Changeset 47f9422

Timestamp:

Apr 24, 2017, 2:35:46 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:

026a0f5, 89a9be2

Parents:

00303d50

Message:

Fixed machinte type dependency on tests folders not in the git repo

Location:

src/tests

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• test.py (modified) (1 diff)

src/tests/Makefile.am

@@ -29 +29 @@
 # applies to both programs
 EXTRA_FLAGS =
-CFLAGS = 2> .err/${@}.log -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 
@@ -52 +53 @@
 
 .dummy : .dummy.c
-        ${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
 
 constant0-1DP : constant0-1.c

src/tests/Makefile.in

@@ -125 +125 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = 2> .err/${@}.log -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -232 +232 @@
 # applies to both programs
 EXTRA_FLAGS = 
+BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
 fstream_test_SOURCES = fstream_test.c
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
@@ -670 +671 @@
 
 .dummy : .dummy.c
-        ${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
 
 constant0-1DP : constant0-1.c

src/tests/test.py

@@ -29 +29 @@
         ret, out = sh("make .dummy", print2stdout=False)
         if ret != 0:
+                print("Failed to identify architecture:")
                 print(out)
+                print("Stopping")
+                sys.exit(1)
         _, out = sh("file .dummy", print2stdout=False)
         sh("rm -f .dummy.c > /dev/null 2>&1")