Changeset 455a7d5 for tests/Makefile.am

Timestamp:

Aug 9, 2018, 6:35:02 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into jenkins-sandbox

File:

• tests/Makefile.am (moved) (moved from src/tests/Makefile.am ) (4 diffs)

tests/Makefile.am

@@ -17 +17 @@
 
 debug=yes
+installed=no
 
 quick_test=avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
 
-if BUILD_CONCURRENCY
 concurrent=
-else
-concurrent='-Econcurrent'
-endif
 
 TEST_PY = python ${srcdir}/test.py
@@ -30 +27 @@
 # applies to both programs
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
-        -XCFA \
-        -t \
-        -B${abs_top_builddir}/src/driver \
         -g \
         -Wall \
         -Wno-unused-function \
         -quiet @CFA_FLAGS@ \
-        -I. \
-        -DIN_DIR="${srcdir}/.in/" \
-        -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr
+        -DIN_DIR="${srcdir}/.in/"
 
-if !BUILD_DEBUG
-AM_CFLAGS += -nodebug
-else
-if !BUILD_RELEASE
-AM_CFLAGS += -debug
-else
-AM_CFLAGS += ${DEBUG_FLAGS}
-endif
-endif
+AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
 
-CC = ${abs_top_builddir}/src/driver/cfa
+CC = @CFACC@
 
-.PHONY : list
+.PHONY: list .validate
+.INTERMEDIATE: .validate .validate.c
 EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
 
@@ -64 +45 @@
 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
 
+#----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -76 +58 @@
         @+${TEST_PY} --list ${concurrent}
 
+.validate: .validate.c
+        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
+
+.validate.c:
+        @echo "int main() { return 0; }" > ${@}
+
 concurrency :
-        @+${TEST_PY} --debug=${debug} -Iconcurrent
+        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
 
-# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
-# however, here it is more complicated because it must match the dependencies based on how
-# they are generated by gcc
-headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
-headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
-headers_deps = $(addprefix %/, $(headers_real))
-$(headers_deps) :
-        echo "Dummy rule, should never be called"
-
-# %/stdlib:
-#       echo "Dummy rule, should never be called"
-
+#----------------------------------------------------------------------------------------------------------------
 # implicit rule so not all test require a rule
 % : %.c $(CC)
-        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}