Changes in tests/Makefile.am [107b01a:e3a5a73]

File:

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

tests/Makefile.am

@@ -23 +23 @@
 installed=no
 
+INSTALL_FLAGS=-in-tree
+DEBUG_FLAGS=-debug -O0
+
 quick_test=avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
 
@@ -28 +31 @@
 timeouts=
 
-TEST_PY = python ${builddir}/test.py
+TEST_PY = python3 ${builddir}/test.py
 
 # applies to both programs
@@ -36 +39 @@
         -Wno-unused-function \
         -quiet @CFA_FLAGS@ \
-        -DIN_DIR="${srcdir}/.in/"
+        -DIN_DIR="${abs_srcdir}/.in/"
 
 AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
@@ -48 +51 @@
 
 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 rules so pretend like we have a C program
-_dummy_hack_SOURCES = .dummy_hack.c
+# automake doesn't know we still need C/CPP rules so pretend like we have a C program
+_dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
 
 #----------------------------------------------------------------------------------------------------------------
@@ -74 +77 @@
         @echo "int main() { return 0; }" > ${@}
 
+.dummy_hackxx.cpp:
+        @echo "int bar() { return 0; }" > ${@}
+
 concurrency :
         @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
@@ -82 +88 @@
 % : %.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+% : %.cpp
+        $(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 declarationSpecifier: declarationSpecifier.cfa $(CFACC)