Changeset 266ecf1 for tests

Timestamp:

Mar 2, 2021, 5:28:32 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6083392

Parents:

182256b (diff), 9eb7a532 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• Makefile.am (modified) (3 diffs)
• io/.expect/many_read.txt (added)
• io/.in/io.data (added)
• io/many_read.cfa (added)

tests/Makefile.am

@@ -44 +44 @@
         -Wall \
         -Wno-unused-function \
-        -quiet @CFA_FLAGS@ \
-        -DIN_DIR="${abs_srcdir}/.in/"
+        -quiet @CFA_FLAGS@
 
 AM_CFAFLAGS = -XCFA --deterministic-out
@@ -76 +75 @@
         long_tests.hfa \
         .in/io.data \
+        io/.in/io.data \
         avltree/avl.h \
         avltree/avl-private.h \
@@ -142 +142 @@
 # don't use distcc to do the linking because distcc doesn't do linking
 % : %.cfa $(CFACCBIN)
-        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
+        $(CFACOMPILETEST) -c -o $(abspath ${@}).o -DIN_DIR="$(abspath $(dir ${<}))/.in/"
         $(CFACCLINK) ${@}.o -o $(abspath ${@})
         rm $(abspath ${@}).o