Changes in tests/Makefile.am [40c81e5:fe94e708]

File:

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

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun Sep 27 19:01:41 2020
-## Update Count     : 84
+## Last Modified On : Tue Nov 20 11:18:51 2018
+## Update Count     : 68
 ###############################################################################
 
@@ -40 +40 @@
         -fdebug-prefix-map=$(abspath ${abs_srcdir})= \
         -fdebug-prefix-map=/tmp= \
-        -fno-diagnostics-show-caret \
         -g \
         -Wall \
@@ -53 +52 @@
 
 # adjust CC to current flags
-CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
+CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CFACC = $(CC)
 
@@ -134 +133 @@
         $(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 \
-        limits nested-types stdincludes cast labelledExit array builtins/sync warnings/self-assignment
-$(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
-        $(CFACOMPILE_SYNTAX)
-        $(if $(test), cp $(test) $(abspath ${@}), )
+# tests that just validate syntax
+expression : expression.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -fsyntax-only 2> $(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 ${@})
+        $(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 ${@})
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
 # Exception Tests