Changeset 3d5701e for tests/Makefile.in


Ignore:
Timestamp:
Feb 25, 2020, 1:17:33 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
7dc2e015
Parents:
9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/Makefile.in

    r9fb8f01 r3d5701e  
    212212AWK = @AWK@
    213213BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    214 CC = @CFACC@
     214
     215# adjust CC to current flags
     216CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
    215217CCAS = @CCAS@
    216218CCASDEPMODE = @CCASDEPMODE@
    217219CCASFLAGS = @CCASFLAGS@
    218220CCDEPMODE = @CCDEPMODE@
    219 CFACC = @CFACC@
     221CFACC = $(CC)
     222CFACC_INSTALL = @CFACC_INSTALL@
    220223CFACPP = @CFACPP@
    221224CFA_BACKEND_CC = @CFA_BACKEND_CC@
    … …  
    248251FGREP = @FGREP@
    249252GREP = @GREP@
     253HAS_DISTCC = @HAS_DISTCC@
    250254HOST_FLAGS = @HOST_FLAGS@
    251255INSTALL = @INSTALL@
    … …  
    354358LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    355359        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
    356         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
    357         $(AM_CFLAGS) $(CFLAGS)
     360        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
    358361
    359362AM_V_CFA = $(am__v_CFA_@AM_V@)
    … …  
    361364am__v_CFA_0 = @echo "  CFA     " $@;
    362365am__v_CFA_1 =
    363 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    364 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    365 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    366 am__v_JAVAC_1 =
    367 AM_V_GOC = $(am__v_GOC_@AM_V@)
    368 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    369 am__v_GOC_0 = @echo "  GOC     " $@;
    370 am__v_GOC_1 =
    371366UPPCC = u++
    372367UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    375370am__v_UPP_0 = @echo "  UPP     " $@;
    376371am__v_UPP_1 =
     372AM_V_GOC = $(am__v_GOC_@AM_V@)
     373am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     374am__v_GOC_0 = @echo "  GOC     " $@;
     375am__v_GOC_1 =
     376AM_V_PY = $(am__v_PY_@AM_V@)
     377am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@)
     378am__v_PY_0 = @echo "  PYTHON  " $@;
     379am__v_PY_1 =
     380AM_V_RUST = $(am__v_RUST_@AM_V@)
     381am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
     382am__v_RUST_0 = @echo "  RUST    " $@;
     383am__v_RUST_1 =
     384AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
     385am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
     386am__v_NODEJS_0 = @echo "  NODEJS  " $@;
     387am__v_NODEJS_1 =
     388AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     389am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     390am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     391am__v_JAVAC_1 =
    377392debug = yes
    378393installed = no
    379394archiveerrors =
    380 INSTALL_FLAGS = -in-tree
    381395DEBUG_FLAGS = -debug -O0
    382396quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
    … …  
    386400
    387401# applies to both programs
    388 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
    389         -quiet @CFA_FLAGS@ -DIN_DIR="${abs_srcdir}/.in/" \
    390         ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
     402# since automake doesn't have support for CFA we have to
     403AM_CFLAGS = $(if $(test), 2> $(test), ) \
     404        -g \
     405        -Wall \
     406        -Wno-unused-function \
     407        -quiet @CFA_FLAGS@ \
     408        -DIN_DIR="${abs_srcdir}/.in/"
     409
     410
     411# get the desired cfa to test
     412TARGET_CFA = $(if $(filter $(installed),yes), @CFACC_INSTALL@, @CFACC@)
     413
     414# get local binary for depedencies
     415CFACCBIN = @CFACC@
     416
     417# adjusted CC but without the actual distcc call
     418CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
    391419PRETTY_PATH = mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
    392420avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
    … …  
    397425
    398426# Use for all tests, make sure the path are correct and all flags are added
    399 CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
    400 
    401 # Use for tests that either generate an executable, print directyl to stdout or the make command is expected to fail
    402 CFATEST_STDOUT = $(CFACOMPILETEST) -o $(abspath ${@})
    403 
    404 # Use for tests where the make command is expecte to succeed but the expected.txt should be compared to stderr
    405 CFATEST_STDERR = $(CFACOMPILETEST) 2> $(abspath ${@})
     427CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGSCFA" | sed 's/-\|\//_/g'))
    406428
    407429#------------------------------------------------------------------------------
    408 # TARGET WITH STANDARD RULE BUT CUSTOM FLAGS
     430# TARGETS WITH CUSTOM FLAGS
    409431#------------------------------------------------------------------------------
    410 # Expected failures
    411 declarationSpecifier_FLAGS = -CFA -XCFA -p
    412 gccExtensions_FLAGS = -CFA -XCFA -p
    413 extension_FLAGS = -CFA -XCFA -p
    414 attributes_FLAGS = -CFA -XCFA -p
    415 functions_FLAGS = -CFA -XCFA -p
    416 KRfunctions_FLAGS = -CFA -XCFA -p
    417 gmp_FLAGS = -lgmp
     432# custom libs
     433gmp_FLAGSLD = -lgmp
    418434
    419435#------------------------------------------------------------------------------
    420 # Expected failures
    421 completeTypeError_FLAGS = -DERR1
     436# Generated code
     437GENERATED_CODE = declarationSpecifier gccExtensions extension attributes functions KRfunctions
     438
     439# Use for tests where the make command is expected to succeed but the expected.txt should be compared to stderr
     440EXPECT_STDERR = builtins/sync warnings/self-assignment
    422441all: all-am
    423442
    … …  
    771790#----------------------------------------------------------------------------------------------------------------
    772791all-local :
    773         @+${TEST_PY} --debug=${debug}  --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
     792        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
    774793
    775794all-tests :
    776         @+${TEST_PY} --debug=${debug}  --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     795        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    777796
    778797clean-local :
    … …  
    801820
    802821# implicit rule so not all test require a rule
    803 % : %.cfa $(CFACC)
    804         $(CFATEST_STDOUT)
    805 
     822# split into two steps to support compiling remotely using distcc
     823# don't use distcc to do the linking because distcc doesn't do linking
     824% : %.cfa $(CFACCBIN)
     825        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
     826        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
     827
     828# implicit rule for c++ test
     829# convient for testing the testsuite itself but not actuall used
    806830% : %.cpp
    807831        $(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     832$(GENERATED_CODE): % : %.cfa $(CFACCBIN)
     833        $(CFACOMPILETEST) -CFA -XCFA -p -c -fsyntax-only -o $(abspath ${@})
     834$(EXPECT_STDERR): % : %.cfa $(CFACCBIN)
     835        $(CFACOMPILETEST) -c -fsyntax-only 2> $(abspath ${@})
    808836
    809837#------------------------------------------------------------------------------
    810838# CUSTOM TARGET
    811839#------------------------------------------------------------------------------
    812 typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
    813         $(CFATEST_STDOUT) -DERR1
    814 
    815 alloc-ERROR: alloc.cfa $(CFACC)
    816         $(CFATEST_STDOUT) -DERR1
    817 
    818 nested-types-ERR1: nested-types.cfa $(CFACC)
    819         $(CFATEST_STDOUT) -DERR1
    820 
    821 nested-types-ERR2: nested-types.cfa $(CFACC)
    822         $(CFATEST_STDOUT) -DERR2
    823 
    824 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
    825         $(CFATEST_STDOUT) -DERR1
    826 
    827 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
    828         $(CFATEST_STDOUT) -DERR2
    829 
    830 raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
    831         $(CFATEST_STDOUT) -DERR1
    832 
    833 raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
    834         $(CFATEST_STDOUT) -DERR1
    835 
    836 #builtins
    837 builtins/sync: builtins/sync.cfa $(CFACC)
    838         $(CFATEST_STDERR) -fsyntax-only
    839 
    840 # Warnings
    841 warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
    842         $(CFATEST_STDERR) -fsyntax-only
     840# expected failures
     841# use custom target since they require a custom define and custom dependencies
     842alloc-ERROR : alloc.cfa $(CFACCBIN)
     843        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
     844
     845typedefRedef-ERR1 : typedefRedef.cfa $(CFACCBIN)
     846        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
     847
     848nested-types-ERR1 : nested-types.cfa $(CFACCBIN)
     849        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
     850
     851nested-types-ERR2 : nested-types.cfa $(CFACCBIN)
     852        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
     853
     854raii/memberCtors-ERR1 : raii/memberCtors.cfa $(CFACCBIN)
     855        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
     856
     857raii/ctor-autogen-ERR1 : raii/ctor-autogen.cfa $(CFACCBIN)
     858        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
     859
     860raii/dtor-early-exit-ERR1 : raii/dtor-early-exit.cfa $(CFACCBIN)
     861        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
     862
     863raii/dtor-early-exit-ERR2 : raii/dtor-early-exit.cfa $(CFACCBIN)
     864        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
     865
     866#------------------------------------------------------------------------------
     867# Other targets
    843868
    844869# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.