Ignore:
Timestamp:
Jul 25, 2018, 6:23:58 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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:
a95c117, f0b3f51
Parents:
40a7d9c (diff), e89f4b1 (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 plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/tests/Makefile.in

    r40a7d9c r91788fa  
    103103mkinstalldirs = $(install_sh) -d
    104104CONFIG_HEADER = $(top_builddir)/config.h
    105 CONFIG_CLEAN_FILES =
     105CONFIG_CLEAN_FILES = config.py
    106106CONFIG_CLEAN_VPATH_FILES =
    107107am__dirstamp = $(am__leading_dot)dirstamp
    … …  
    180180ETAGS = etags
    181181CTAGS = ctags
    182 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp
     182am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \
     183        $(top_srcdir)/automake/depcomp
    183184DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    184185ACLOCAL = @ACLOCAL@
    … …  
    191192AWK = @AWK@
    192193BACKEND_CC = @BACKEND_CC@
    193 CC = @CFA_BINDIR@/@CFA_NAME@
     194CC = ${abs_top_builddir}/src/driver/cfa -DIN_DIR="${srcdir}/.in/"
    194195CCAS = @CCAS@
    195196CCASDEPMODE = @CCASDEPMODE@
    … …  
    306307@BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent'
    307308@BUILD_CONCURRENCY_TRUE@concurrent =
     309TEST_PY = python ${srcdir}/test.py
    308310
    309311# applies to both programs
    … …  
    350352        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    351353$(am__aclocal_m4_deps):
     354config.py: $(top_builddir)/config.status $(srcdir)/config.py.in
     355        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    352356avltree/$(am__dirstamp):
    353357        @$(MKDIR_P) avltree
    … …  
    731735
    732736all-local :
    733         @+python test.py --debug=${debug} ${concurrent} ${quick_test}
     737        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
    734738
    735739all-tests :
    736         @+python test.py --all --debug=${debug} ${concurrent}           # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     740        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    737741
    738742clean-local :
    … …  
    740744
    741745list :
    742         @+python test.py --list ${concurrent}
     746        @+${TEST_PY} --list ${concurrent}
    743747
    744748concurrency :
    745         @+python test.py --debug=${debug} -Iconcurrent
    746 
    747 .dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
    748         ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
    749 
    750 % : %.c @CFA_BINDIR@/@CFA_NAME@
    751         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
     749        @+${TEST_PY} --debug=${debug} -Iconcurrent
     750
     751% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
     752        $(COMPILE) $(abspath ${<}) -o ${@}
    752753
    753754declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
    754         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     755        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    755756
    756757gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
    757         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     758        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    758759
    759760extension : extension.c @CFA_BINDIR@/@CFA_NAME@
    760         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     761        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    761762
    762763attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
    763         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     764        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    764765
    765766functions: functions.c @CFA_BINDIR@/@CFA_NAME@
    766         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     767        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    767768
    768769KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
    769         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     770        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    770771
    771772sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
    772         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     773        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    773774
    774775gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
    775         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
     776        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
    776777
    777778completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
    778         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     779        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    779780
    780781typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
    781         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     782        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    782783
    783784alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
    784         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     785        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    785786
    786787fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
    787         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     788        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    788789
    789790nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
    790         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     791        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    791792
    792793nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
    793         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
     794        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
    794795
    795796# Constructor/destructor tests
    796797raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
    797         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     798        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    798799
    799800raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
    800         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
     801        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
    801802
    802803raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
    803         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     804        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    804805
    805806raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
    806         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
     807        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    807808
    808809# Warnings
    809810warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
    810         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
     811        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
    811812
    812813#builtins
    813814builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
    814         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
     815        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
    815816
    816817# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.