Changeset 3537dd7 for src/tests

Timestamp:

Aug 3, 2018, 9:02:32 AM (6 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:

ac3362c

Parents:

04e367c (diff), f7ac09d (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:/u/cforall/software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/heap.txt (added)
• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (4 diffs)
• heap.c (added)
• preempt_longrun/Makefile.am (modified) (1 diff)
• preempt_longrun/Makefile.in (modified) (2 diffs)
• pybin/tools.py (modified) (1 diff)

src/tests/Makefile.am

@@ -30 +30 @@
 # applies to both programs
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
-        -XCFA \
-        -t \
-        -B${abs_top_builddir}/src/driver \
         -g \
         -Wall \
         -Wno-unused-function \
         -quiet @CFA_FLAGS@ \
-        -I. \
         -DIN_DIR="${srcdir}/.in/" \
-        -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr
+        @BUILD_IN_TREE_FLAGS@
 
 if !BUILD_DEBUG
@@ -55 +47 @@
 endif
 
-CC = ${abs_top_builddir}/src/driver/cfa
+CC = @CFACC@
 
 .PHONY : list
@@ -93 +85 @@
 # implicit rule so not all test require a rule
 % : %.c $(CC)
-        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}
 

src/tests/Makefile.in

@@ -181 +181 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = ${abs_top_builddir}/src/driver/cfa
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
+CC = @CFACC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
@@ -202 +206 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -298 +303 @@
 
 # applies to both programs
-AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \
-        -B${abs_top_builddir}/src/driver -g -Wall -Wno-unused-function \
-        -quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/" \
-        -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
-        $(am__append_2) $(am__append_3)
+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)
 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
@@ -641 +641 @@
 # implicit rule so not all test require a rule
 % : %.c $(CC)
-        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}
 

src/tests/preempt_longrun/Makefile.am

@@ -32 +32 @@
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z)
 CFLAGS = ${BUILD_FLAGS}
-CC = ${top_builddir}/src/driver/cfa
+CC = @CFACC@
 
 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield

src/tests/preempt_longrun/Makefile.in

@@ -337 +337 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = ${top_builddir}/src/driver/cfa
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
+CC = @CFACC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
@@ -358 +362 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

src/tests/pybin/tools.py

@@ -48 +48 @@
                 return False
 
-        return match.group(1) == "ASCII text"
+        return match.group(1).startswith("ASCII text")
 
 # Remove 1 or more files silently