Changeset 5e44ac2 for tests/Makefile.in

Timestamp:

Aug 15, 2018, 1:58:02 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

90cac45

Parents:

d7d63e5 (diff), 7bd4cc9 (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 demangler

File:

• tests/Makefile.in (moved) (moved from src/tests/Makefile.in ) (9 diffs)

tests/Makefile.in

@@ -91 +91 @@
 build_triplet = @build@
 host_triplet = @host@
-@BUILD_DEBUG_FALSE@am__append_1 = -nodebug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_2 = -debug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_3 = ${DEBUG_FLAGS}
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) avl_test$(EXEEXT)
-subdir = src/tests
+subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -182 +180 @@
 BACKEND_CC = @BACKEND_CC@
 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
-BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@
@@ -213 +210 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -222 +220 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -241 +240 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
@@ -296 +296 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
 debug = yes
+installed = no
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
-@BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent'
-@BUILD_CONCURRENCY_TRUE@concurrent = 
+concurrent = 
 TEST_PY = python ${srcdir}/test.py
 
 # applies to both programs
 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
-        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
-        @BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
-        $(am__append_3)
+        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" ${DEBUG_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
-
-# 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))
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj
+.SUFFIXES: .c .o .obj .validate
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
@@ -329 +322 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
         $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --foreign src/tests/Makefile
+          $(AUTOMAKE) --foreign tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
@@ -617 +610 @@
 
 
-.PHONY : list
-
+.PHONY: list .validate
+.INTERMEDIATE: .validate .validate.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 :
@@ -631 +626 @@
         @+${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
-$(headers_deps) :
-        echo "Dummy rule, should never be called"
-
-# %/stdlib:
-#       echo "Dummy rule, should never be called"
-
+        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
+
+#----------------------------------------------------------------------------------------------------------------
 # implicit rule so not all test require a rule
 % : %.c $(CC)