Changes in tests/Makefile.am [0783909:ee0bfa9]

File:

• tests/Makefile.am (modified) (9 diffs)

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Oct  9 23:13:07 2020
-## Update Count     : 86
+## Last Modified On : Tue Nov 20 11:18:51 2018
+## Update Count     : 68
 ###############################################################################
 
@@ -18 +18 @@
 ACLOCAL_AMFLAGS  = -I automake
 
-include $(top_srcdir)/tools/build/cfa.make
-
-DEFAULT_INCLUDES = -I${abs_srcdir}
+include $(top_srcdir)/src/cfa.make
 
 debug=yes
@@ -38 +36 @@
 # since automake doesn't have support for CFA we have to
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
-        -fdebug-prefix-map=$(abspath ${abs_srcdir})= \
-        -fdebug-prefix-map=/tmp= \
-        -fno-diagnostics-show-caret \
         -g \
         -Wall \
@@ -47 +42 @@
         -DIN_DIR="${abs_srcdir}/.in/"
 
-AM_CFAFLAGS = -XCFA --deterministic-out
-
 # get the desired cfa to test
 TARGET_CFA = $(if $(filter $(installed),yes), @CFACC_INSTALL@, @CFACC@)
 
 # adjust CC to current flags
-CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS} ${AST_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS} ${AST_FLAGS})
+CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CFACC = $(CC)
 
@@ -60 +53 @@
 
 # adjusted CC but without the actual distcc call
-CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS} ${AST_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS} ${AST_FLAGS})
-CFACCLINK = $(CFACCLOCAL) -quiet $(if $(test), 2> $(test), ) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g'))
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 
 PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
@@ -68 +60 @@
 .INTERMEDIATE: .validate .validate.cfa
 EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install
-EXTRA_DIST = test.py \
-        pybin/__init__.py \
-        pybin/print-core.gdb \
-        pybin/settings.py \
-        pybin/test_run.py \
-        pybin/tools.py \
-        long_tests.hfa \
-        .in/io.data \
-        avltree/avl.h \
-        avltree/avl-private.h \
-        concurrent/clib.c \
-        exceptions/with-threads.hfa \
-        exceptions/except-io.hfa
-
-dist-hook:
-        echo "Gathering test files"
-        for file in `${TEST_PY} --list-dist`; do \
-                if test -f ${srcdir}/$${file}; then \
-                        $(MKDIR_P) $$(dirname ${distdir}/$${file}); \
-                        cp -df ${srcdir}/$${file} ${distdir}/$${file}; \
-                fi; \
-        done
 
 avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
 # automake doesn't know we still need C/CPP rules so pretend like we have a C program
-nodist__dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
+_dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
 
 #----------------------------------------------------------------------------------------------------------------
@@ -102 +72 @@
         @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
-mostlyclean-local :
-        find ${builddir} -not -path './__pycache__/*' -path '*.o' -delete
-        find ${builddir} -not -path './__pycache__/*' -path '*/.err/*.log' -delete
-        find ${builddir} -not -path './__pycache__/*' -path '*/.out/*.log' -delete
+clean-local :
         rm -f ${EXTRA_PROGRAMS}
-        rm -rf __pycache__
-
-distclean-local :
-        find ${builddir} -path '*.Po' -delete
 
 list :
@@ -143 +106 @@
 % : %.cfa $(CFACCBIN)
         $(CFACOMPILETEST) -c -o $(abspath ${@}).o
-        $(CFACCLINK) ${@}.o -o $(abspath ${@})
-        rm $(abspath ${@}).o
+        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
 
 # implicit rule for c++ test
@@ -163 +125 @@
         $(CFACOMPILETEST) -CFA -XCFA -p -c -fsyntax-only -o $(abspath ${@})
 
+# Use for tests where the make command is expected to succeed but the expected.txt should be compared to stderr
+EXPECT_STDERR = builtins/sync warnings/self-assignment
+$(EXPECT_STDERR): % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -fsyntax-only 2> $(abspath ${@})
+
 #------------------------------------------------------------------------------
 # CUSTOM TARGET
 #------------------------------------------------------------------------------
-# tests that just validate syntax and compiler output should be compared to stderr
-CFACOMPILE_SYNTAX = $(CFACOMPILETEST) -Wno-unused-variable -Wno-unused-label -c -fsyntax-only -o $(abspath ${@})
-
-SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
-        init1 limits nested-types stdincludes cast labelledExit array builtins/sync warnings/self-assignment
-$(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX)
-        $(if $(test), cp $(test) $(abspath ${@}), )
-
 # expected failures
-# use custom target since they require a custom define *and* have a name that doesn't match the file
+# use custom target since they require a custom define and custom dependencies
 alloc-ERROR : alloc.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
-
-init1-ERROR : init1.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
 typedefRedef-ERR1 : typedefRedef.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
 nested-types-ERR1 : nested-types.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
 nested-types-ERR2 : nested-types.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR2
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
 raii/memberCtors-ERR1 : raii/memberCtors.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
 raii/ctor-autogen-ERR1 : raii/ctor-autogen.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
 raii/dtor-early-exit-ERR1 : raii/dtor-early-exit.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR1
-        -cp $(test) $(abspath ${@})
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
 raii/dtor-early-exit-ERR2 : raii/dtor-early-exit.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX) -DERR2
-        -cp $(test) $(abspath ${@})
-
-# Exception Tests
-# Test with libcfathread; it changes how storage works.
-
-exceptions/%-threads : exceptions/%.cfa $(CFACCBIN)
-        $(CFACOMPILETEST) -include exceptions/with-threads.hfa -c -o $(abspath ${@}).o
-        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
-
-# Linking tests
-# Meta tests to make sure we see linking errors (can't compile with -O2 since it may multiply number of calls)
-linking/linkerror : linking/linkerror.cfa $(CFACCBIN)
-        $(CFACOMPILETEST) -O0 -c -o $(abspath ${@}).o
-        $(CFACCLINK)  -O0 ${@}.o -o $(abspath ${@})
-        rm $(abspath ${@}).o
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
 #------------------------------------------------------------------------------