Ignore:
Timestamp:
Jul 25, 2018, 4:44:25 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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
Children:
56de5932
Parents:
857638d
Message:

Tests no longer require installing cfa/libcfa

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/Makefile.am

    r857638d rb8f6002  
    2929
    3030# applies to both programs
    31 DEBUG_FLAGS =
     31AM_CFLAGS = $(if $(test), 2> $(test), ) \
     32        -XCFA \
     33        -t \
     34        -B${abs_top_builddir}/src/driver \
     35        -g \
     36        -Wall \
     37        -Wno-unused-function \
     38        -quiet @CFA_FLAGS@ \
     39        -I. \
     40        -DIN_DIR="${srcdir}/.in/" \
     41        -L${abs_top_builddir}/src/libcfa \
     42        -I${abs_top_srcdir}/src/libcfa \
     43        -I${abs_top_srcdir}/src/libcfa/containers \
     44        -I${abs_top_srcdir}/src/libcfa/concurrency \
     45        -I${abs_top_srcdir}/src/libcfa/stdhdr
    3246
    33 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/"
    3447if !BUILD_DEBUG
    35 BUILD_FLAGS += -nodebug
     48AM_CFLAGS += -nodebug
    3649else
    3750if !BUILD_RELEASE
    38 BUILD_FLAGS += -debug
     51AM_CFLAGS += -debug
    3952else
    40 BUILD_FLAGS += ${DEBUG_FLAGS}
     53AM_CFLAGS += ${DEBUG_FLAGS}
    4154endif
    4255endif
    4356
    44 TEST_FLAGS = $(if $(test), 2> $(test), )
    45 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
    4657CC = ${abs_top_builddir}/src/driver/cfa
    4758
     
    5061
    5162fstream_test_SOURCES = fstream_test.c
    52 fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
    5363
    5464avl_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
    55 avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
    5665
    5766all-local :
     
    7079        @+${TEST_PY} --debug=${debug} -Iconcurrent
    7180
    72 % : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
     81% : %.c $(CC)
    7382        $(COMPILE) $(abspath ${<}) -o ${@}
    7483
    75 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
     84declarationSpecifier: declarationSpecifier.c $(CC)
    7685        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    7786
    78 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
     87gccExtensions : gccExtensions.c $(CC)
    7988        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8089
    81 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
     90extension : extension.c $(CC)
    8291        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8392
    84 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
     93attributes : attributes.c $(CC)
    8594        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8695
    87 functions: functions.c @CFA_BINDIR@/@CFA_NAME@
     96functions: functions.c $(CC)
    8897        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8998
    90 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
     99KRfunctions : KRfunctions.c $(CC)
    91100        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    92101
    93 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
     102sched-ext-parse : sched-ext-parse.c $(CC)
    94103        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    95104
    96 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
     105gmp : gmp.c $(CC)
    97106        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
    98107
    99 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
     108completeTypeError : completeTypeError.c $(CC)
    100109        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    101110
    102 typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
     111typedefRedef-ERR1: typedefRedef.c $(CC)
    103112        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    104113
    105 alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
     114alloc-ERROR: alloc.c $(CC)
    106115        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    107116
    108 fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
     117fallthrough-ERROR: fallthrough.c $(CC)
    109118        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    110119
    111 nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
     120nested-types-ERR1: nested-types.c $(CC)
    112121        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    113122
    114 nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
     123nested-types-ERR2: nested-types.c $(CC)
    115124        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
    116125
    117126# Constructor/destructor tests
    118 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
     127raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
    119128        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    120129
    121 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
     130raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
    122131        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
    123132
    124 raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
     133raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
    125134        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    126135
    127 raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
     136raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
    128137        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    129138
    130139# Warnings
    131 warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
     140warnings/self-assignment: warnings/self-assignment.c $(CC)
    132141        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
    133142
    134143#builtins
    135 builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
     144builtins/sync: builtins/sync.c $(CC)
    136145        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
Note: See TracChangeset for help on using the changeset viewer.