Changeset 4df85197


Ignore:
Timestamp:
Jun 1, 2016, 5:59:00 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
77f347d, be945ac, e24f13a
Parents:
83de11e (diff), 3d1e617 (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

Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/examples/runTests.sh

    r83de11e r4df85197  
    3636make clean > /dev/null 2>&1
    3737
     38ret_val=0
     39
    3840for test in $tests; do
    3941        echo -n "    $test" | tee -a $logfile
     
    4143        # build, skipping to next test on error
    4244        if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
     45                ret_val=1
    4346                echo -e "\tFAILED with build error:" | tee -a $logfile
    4447                cat tests/$test.make.txt | tee -a $logfile
     
    5053        ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
    5154        if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
     55                ret_val=1
    5256                echo -e "\tFAILED with output mismatch:" | tee -a $logfile
    5357                cat tests/$test.diff.txt | tee -a $logfile
     
    5862        echo -e "\tPASSED" | tee -a $logfile
    5963done
     64
     65exit $((ret_val))
  • src/libcfa/Makefile.am

    r83de11e r4df85197  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Apr 19 22:30:17 2016
    14 ## Update Count     : 124
     13## Last Modified On : Tue May 31 13:24:15 2016
     14## Update Count     : 141
    1515###############################################################################
    1616
     
    5353CC = ${abs_top_srcdir}/src/driver/cfa
    5454
    55 # extension-less header files are overridden by default make rules => explicitly override rule
    56 % : %.c
    57         true
     55headers = limits stdlib math iostream fstream iterator rational
     56.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
    5857
    59 .c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
    60         ${CC} ${CFLAGS} -c -o $@ $<
     58libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
    6159
    62 libs = limits stdlib math iostream fstream iterator rational
    63 libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
    64 
    65 cheaders = # expat
    66 cfaheaders = # limits
    67 include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
     60include_HEADERS = ${headers}
    6861
    6962CLEANFILES = libcfa-prelude.c
  • src/libcfa/Makefile.in

    r83de11e r4df85197  
    214214MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} \
    215215        ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
    216 libs = limits stdlib math iostream fstream iterator rational
    217 libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
    218 cheaders = # expat
    219 cfaheaders = # limits
    220 include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
     216headers = limits stdlib math iostream fstream iterator rational
     217libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
     218include_HEADERS = ${headers}
    221219CLEANFILES = libcfa-prelude.c
    222220all: all-am
     
    303301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
    304302@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
     303
     304.c.o:
     305@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
     306@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     307@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     308@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     309@am__fastdepCC_FALSE@   $(COMPILE) -c $<
    305310
    306311.c.obj:
     
    582587libcfa-prelude.o : libcfa-prelude.c
    583588        @BACKEND_CC@ -c -o $@ $<
    584 
    585 # extension-less header files are overridden by default make rules => explicitly override rule
    586 % : %.c
    587         true
    588 
    589 .c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
    590         ${CC} ${CFLAGS} -c -o $@ $<
     589.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
    591590
    592591# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.