Changeset 6d44da1 for tests/Makefile.am


Ignore:
Timestamp:
Sep 25, 2018, 11:35:34 AM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
c6bbcdb
Parents:
341bb80 (diff), 7428ad9 (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' into shared_library

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/Makefile.am

    r341bb80 r6d44da1  
    2323
    2424concurrent=
     25timeouts=
    2526
    2627TEST_PY = python ${builddir}/test.py
    … …  
    3839CC = @CFACC@
    3940
     41PRETTY_PATH=cd ${srcdir} &&
     42
    4043.PHONY: list .validate
    4144.INTERMEDIATE: .validate .validate.c
    … …  
    4851#----------------------------------------------------------------------------------------------------------------
    4952all-local :
    50         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
     53        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
    5154
    5255all-tests :
    53         @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     56        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    5457
    5558clean-local :
    … …  
    7174# implicit rule so not all test require a rule
    7275% : %.c $(CC)
    73         $(COMPILE) $(abspath ${<}) -o ${@}
     76        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    7477
    7578declarationSpecifier: declarationSpecifier.c $(CC)
    76         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     79        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    7780
    7881gccExtensions : gccExtensions.c $(CC)
    79         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     82        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8083
    8184extension : extension.c $(CC)
    82         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     85        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8386
    8487attributes : attributes.c $(CC)
    85         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     88        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8689
    8790functions: functions.c $(CC)
    88         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     91        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    8992
    9093KRfunctions : KRfunctions.c $(CC)
    91         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     94        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    9295
    9396sched-ext-parse : sched-ext-parse.c $(CC)
    94         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     97        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    9598
    9699gmp : gmp.c $(CC)
    97         $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
     100        $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    98101
     102#builtins
     103builtins/sync: builtins/sync.c $(CC)
     104        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
     105
     106#------------------------------------------------------------------------------
     107#To make errors path independent we need to cd into the correct directories
    99108completeTypeError : completeTypeError.c $(CC)
    100         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     109        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    101110
    102111typedefRedef-ERR1: typedefRedef.c $(CC)
    103         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     112        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    104113
    105114alloc-ERROR: alloc.c $(CC)
    106         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     115        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    107116
    108117fallthrough-ERROR: fallthrough.c $(CC)
    109         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     118        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    110119
    111120nested-types-ERR1: nested-types.c $(CC)
    112         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     121        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    113122
    114123nested-types-ERR2: nested-types.c $(CC)
    115         $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
     124        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    116125
    117126# Constructor/destructor tests
    118127raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
    119         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     128        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    120129
    121130raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
    122         $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
     131        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    123132
    124133raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
    125         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     134        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    126135
    127136raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
    128         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     137        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    129138
    130139# Warnings
    131140warnings/self-assignment: warnings/self-assignment.c $(CC)
    132         $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
    133 
    134 #builtins
    135 builtins/sync: builtins/sync.c $(CC)
    136         $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
     141        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
Note: See TracChangeset for help on using the changeset viewer.