Changeset 1e995d6


Ignore:
Timestamp:
Nov 16, 2018, 4:01:14 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
3d99498
Parents:
80228a7
Message:

fix cfa-suffix problem in build

Location:
tests
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tests/Makefile.am

    r80228a7 r1e995d6  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Wed Nov  7 12:03:29 2018
    14 ## Update Count     : 59
     13## Last Modified On : Fri Nov 16 15:29:54 2018
     14## Update Count     : 65
    1515###############################################################################
    1616
     
    3838
    3939AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
    40 
    4140CC = @CFACC@
    4241
     
    4443
    4544.PHONY: list .validate
    46 .INTERMEDIATE: .validate .validate.c
     45.INTERMEDIATE: .validate .validate.cfa
    4746EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
    4847
     
    6463        @+${TEST_PY} --list ${concurrent}
    6564
    66 .validate: .validate.c
    67         $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
     65.validate: .validate.cfa
     66        $(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
    6867
    69 .validate.c:
     68.validate.cfa:
     69        @echo "int main() { return 0; }" > ${@}
     70
     71dummy_hack.c:
    7072        @echo "int main() { return 0; }" > ${@}
    7173
     
    7678
    7779# implicit rule so not all test require a rule
    78 % : %.c $(CC)
    79         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     80% : %.c $(CFACC)
     81        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8082
    81 declarationSpecifier: declarationSpecifier.cfa $(CC)
    82         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     83% : %.cfa $(CFACC)
     84        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8385
    84 gccExtensions : gccExtensions.cfa $(CC)
    85         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     86declarationSpecifier: declarationSpecifier.cfa $(CFACC)
     87        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8688
    87 extension : extension.cfa $(CC)
    88         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     89gccExtensions : gccExtensions.cfa $(CFACC)
     90        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8991
    90 attributes : attributes.cfa $(CC)
    91         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     92extension : extension.cfa $(CFACC)
     93        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    9294
    93 functions: functions.cfa $(CC)
    94         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     95attributes : attributes.cfa $(CFACC)
     96        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    9597
    96 KRfunctions : KRfunctions.cfa $(CC)
    97         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     98functions: functions.cfa $(CFACC)
     99        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    98100
    99 sched-ext-parse : sched-ext-parse.c $(CC)
    100         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     101KRfunctions : KRfunctions.cfa $(CFACC)
     102        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    101103
    102 gmp : gmp.cfa $(CC)
    103         $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     104sched-ext-parse : sched-ext-parse.c $(CFACC)
     105        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     106
     107gmp : gmp.cfa $(CFACC)
     108        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    104109
    105110#builtins
    106 builtins/sync: builtins/sync.c $(CC)
    107         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
     111builtins/sync: builtins/sync.c $(CFACC)
     112        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
    108113
    109114#------------------------------------------------------------------------------
    110115
    111116#To make errors path independent we need to cd into the correct directories
    112 completeTypeError : completeTypeError.cfa $(CC)
    113         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     117completeTypeError : completeTypeError.cfa $(CFACC)
     118        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    114119
    115 typedefRedef-ERR1: typedefRedef.cfa $(CC)
    116         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     120typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
     121        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    117122
    118 alloc-ERROR: alloc.cfa $(CC)
    119         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     123alloc-ERROR: alloc.cfa $(CFACC)
     124        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    120125
    121 fallthrough-ERROR: fallthrough.cfa $(CC)
    122         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     126fallthrough-ERROR: fallthrough.cfa $(CFACC)
     127        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    123128
    124 nested-types-ERR1: nested-types.cfa $(CC)
    125         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     129nested-types-ERR1: nested-types.cfa $(CFACC)
     130        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    126131
    127 nested-types-ERR2: nested-types.cfa $(CC)
    128         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     132nested-types-ERR2: nested-types.cfa $(CFACC)
     133        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    129134
    130135# Constructor/destructor tests
    131 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
    132         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     136raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CFACC)
     137        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    133138
    134 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
    135         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     139raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CFACC)
     140        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    136141
    137 raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
    138         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     142raii/memberCtors-ERR1: raii/memberCtors.c $(CFACC)
     143        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    139144
    140 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
    141         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     145raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CFACC)
     146        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    142147
    143148# Warnings
    144 warnings/self-assignment: warnings/self-assignment.c $(CC)
    145         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
     149warnings/self-assignment: warnings/self-assignment.c $(CFACC)
     150        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
  • tests/Makefile.in

    r80228a7 r1e995d6  
    624624
    625625.PHONY: list .validate
    626 .INTERMEDIATE: .validate .validate.c
     626.INTERMEDIATE: .validate .validate.cfa
    627627
    628628#----------------------------------------------------------------------------------------------------------------
     
    639639        @+${TEST_PY} --list ${concurrent}
    640640
    641 .validate: .validate.c
    642         $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
    643 
    644 .validate.c:
     641.validate: .validate.cfa
     642        $(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
     643
     644.validate.cfa:
     645        @echo "int main() { return 0; }" > ${@}
     646
     647dummy_hack.c:
    645648        @echo "int main() { return 0; }" > ${@}
    646649
     
    651654
    652655# implicit rule so not all test require a rule
    653 % : %.c $(CC)
    654         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    655 
    656 declarationSpecifier: declarationSpecifier.cfa $(CC)
    657         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    658 
    659 gccExtensions : gccExtensions.cfa $(CC)
    660         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    661 
    662 extension : extension.cfa $(CC)
    663         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    664 
    665 attributes : attributes.cfa $(CC)
    666         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    667 
    668 functions: functions.cfa $(CC)
    669         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    670 
    671 KRfunctions : KRfunctions.cfa $(CC)
    672         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    673 
    674 sched-ext-parse : sched-ext-parse.c $(CC)
    675         $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    676 
    677 gmp : gmp.cfa $(CC)
    678         $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     656% : %.c $(CFACC)
     657        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     658
     659% : %.cfa $(CFACC)
     660        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     661
     662declarationSpecifier: declarationSpecifier.cfa $(CFACC)
     663        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     664
     665gccExtensions : gccExtensions.cfa $(CFACC)
     666        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     667
     668extension : extension.cfa $(CFACC)
     669        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     670
     671attributes : attributes.cfa $(CFACC)
     672        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     673
     674functions: functions.cfa $(CFACC)
     675        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     676
     677KRfunctions : KRfunctions.cfa $(CFACC)
     678        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     679
     680sched-ext-parse : sched-ext-parse.c $(CFACC)
     681        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     682
     683gmp : gmp.cfa $(CFACC)
     684        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    679685
    680686#builtins
    681 builtins/sync: builtins/sync.c $(CC)
    682         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
     687builtins/sync: builtins/sync.c $(CFACC)
     688        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
    683689
    684690#------------------------------------------------------------------------------
    685691
    686692#To make errors path independent we need to cd into the correct directories
    687 completeTypeError : completeTypeError.cfa $(CC)
    688         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    689 
    690 typedefRedef-ERR1: typedefRedef.cfa $(CC)
    691         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    692 
    693 alloc-ERROR: alloc.cfa $(CC)
    694         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    695 
    696 fallthrough-ERROR: fallthrough.cfa $(CC)
    697         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    698 
    699 nested-types-ERR1: nested-types.cfa $(CC)
    700         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    701 
    702 nested-types-ERR2: nested-types.cfa $(CC)
    703         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     693completeTypeError : completeTypeError.cfa $(CFACC)
     694        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     695
     696typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
     697        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     698
     699alloc-ERROR: alloc.cfa $(CFACC)
     700        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     701
     702fallthrough-ERROR: fallthrough.cfa $(CFACC)
     703        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     704
     705nested-types-ERR1: nested-types.cfa $(CFACC)
     706        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     707
     708nested-types-ERR2: nested-types.cfa $(CFACC)
     709        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    704710
    705711# Constructor/destructor tests
    706 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
    707         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    708 
    709 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
    710         $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    711 
    712 raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
    713         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    714 
    715 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
    716         $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     712raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CFACC)
     713        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     714
     715raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CFACC)
     716        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     717
     718raii/memberCtors-ERR1: raii/memberCtors.c $(CFACC)
     719        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     720
     721raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CFACC)
     722        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    717723
    718724# Warnings
    719 warnings/self-assignment: warnings/self-assignment.c $(CC)
    720         $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
     725warnings/self-assignment: warnings/self-assignment.c $(CFACC)
     726        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
    721727
    722728# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.