Changeset e8fe5e0


Ignore:
Timestamp:
Mar 28, 2019, 11:49:44 AM (2 years ago)
Author:
tdelisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
ea62265
Parents:
1241851
Message:

Fixing longrun_tests to compile

Location:
longrun_tests
Files:
5 added
5 deleted
2 edited
6 moved

Legend:

Unmodified
Added
Removed
  • longrun_tests/Makefile.am

    r1241851 re8fe5e0  
    1818ACLOCAL_AMFLAGS  = -I automake
    1919
     20include $(top_srcdir)/src/cfa.make
     21
    2022repeats=10
    2123max_time=600
     
    2426type=LONG
    2527
    26 REPEAT = ${abs_top_srcdir}/tools/repeat
    27 WATCHDOG = ${abs_top_srcdir}/tools/watchdog
     28REPEAT = $(abs_top_builddir)/tools/repeat
     29WATCHDOG = $(abs_top_builddir)/tools/watchdog
    2830TIME = /usr/bin/time -f "%E"
    2931
    30 # $(shell ./update-type $(type))
    31 # ./update-type $(type)
     32UPDATED_TYPE = $(shell $(srcdir)/update-type $(type))
    3233
    33 UPDATED_TYPE = $(shell ./update-type $(type))
    34 
    35 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I../tests -I. -DTEST_$(shell cat .type | tr a-z A-Z)
    36 CFLAGS = ${BUILD_FLAGS}
    37 CC = @CFACC@
     34BUILD_FLAGS =
     35AM_CFAFLAGS = \
     36        -g \
     37        -Wall \
     38        -Wno-unused-function \
     39        -quiet \
     40        -O2 \
     41        -DPREEMPTION_RATE=$(preempt) \
     42        -I$(abs_top_srcdir)/tests \
     43        -I$(srcdir) \
     44        -DTEST_$(shell cat .type | tr a-z A-Z) \
     45        -in-tree
    3846
    3947TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
    4048
    41 # .INTERMEDIATE: ${TESTS}
     49# .INTERMEDIATE: $(TESTS)
    4250
    43 all-local: ${TESTS:=.run}
     51all-local: $(TESTS:=.run)
    4452
    45 runall : ${TESTS:=.run}
     53runall : $(TESTS:=.run)
    4654        @ echo "All programs terminated normally"
    4755
    48 watchall : ${TESTS:=.watch}
     56watchall : $(TESTS:=.watch)
    4957        @ echo "All programs terminated normally"
    5058
    51 compileall : ${TESTS}
     59compileall : $(TESTS)
    5260        @ echo "Compiled"
    5361
    5462clean-local:
    55         rm -f ${TESTS} core* out.log .type
     63        rm -f $(TESTS) core* out.log .type
    5664
    57 % : %.c ${CC} ${UPDATED_TYPE}
    58         ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
     65% : %.cfa $(CFACC) $(UPDATED_TYPE)
     66        $(AM_V_CFA)$(CFACOMPILE) $(<) $(debug) -o $(@)
    5967
    60 %.run : % ${REPEAT}
    61         @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
    62         @ rm ${<}
    63         @ echo -e "${<}: SUCCESS\n"
     68%.run : % $(REPEAT)
     69        @ time $(REPEAT) -r out.log -i -s $(repeats) timeout $(max_time) ./$(<)
     70        @ rm $(<)
     71        @ echo -e "$(<): SUCCESS\n"
    6472
    65 %.watch : % ${WATCHDOG}
    66         @ time ${WATCHDOG} ./${<}
    67         @ rm ${<}
    68         @ echo -e "${<}: SUCCESS\n"
     73%.watch : % $(WATCHDOG)
     74        @ time $(WATCHDOG} ./$(<)
     75        @ rm $(<)
     76        @ echo -e "$(<): SUCCESS\n"
    6977
    70 %.time : % ${REPEAT}
    71         @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
    72         @ rm ${<}
    73         @ echo -e "${<}: SUCCESS\n"
     78%.time : % $(REPEAT)
     79        @ $(REPEAT) -i -s -- $(repeats) $(TIME) -a -o times.log ./$(<)
     80        @ rm $(<)
     81        @ echo -e "$(<): SUCCESS\n"
    7482
    75 ${REPEAT}: ${abs_top_srcdir}/tools/Makefile
    76         @+make -C ${abs_top_srcdir}/tools/
     83$(REPEAT): $(abs_top_builddir)/tools/Makefile
     84        @+make -C $(abs_top_builddir)/tools/
    7785
    78 ${WATCHDOG}: ${abs_top_srcdir}/tools/Makefile
    79         @+make -C ${abs_top_srcdir}/tools/
     86$(WATCHDOG): $(abs_top_builddir)/tools/Makefile
     87        @+make -C $(abs_top_builddir)/tools/
  • longrun_tests/Makefile.in

    r1241851 re8fe5e0  
    331331        $(TEST_LOG_FLAGS)
    332332am__DIST_COMMON = $(srcdir)/Makefile.in \
    333         $(top_srcdir)/automake/test-driver
     333        $(top_srcdir)/automake/test-driver $(top_srcdir)/src/cfa.make
    334334DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    335335ACLOCAL = @ACLOCAL@
     
    342342AWK = @AWK@
    343343BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    344 CC = @CFACC@
     344CC = @CC@
    345345CCAS = @CCAS@
    346346CCASDEPMODE = @CCASDEPMODE@
     
    356356CFA_NAME = @CFA_NAME@
    357357CFA_PREFIX = @CFA_PREFIX@
    358 CFLAGS = ${BUILD_FLAGS}
     358CFLAGS = @CFLAGS@
    359359CPP = @CPP@
    360360CPPFLAGS = @CPPFLAGS@
     
    479479AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    480480ACLOCAL_AMFLAGS = -I automake
     481CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     482LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     483        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
     484        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
     485        $(AM_CFLAGS) $(CFLAGS)
     486
     487AM_V_CFA = $(am__v_CFA_@AM_V@)
     488am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
     489am__v_CFA_0 = @echo "  CFA     " $@;
     490am__v_CFA_1 =
     491AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     492am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     493am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     494am__v_JAVAC_1 =
     495AM_V_GOC = $(am__v_GOC_@AM_V@)
     496am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     497am__v_GOC_0 = @echo "  GOC     " $@;
     498am__v_GOC_1 =
     499UPPCC = u++
     500UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     501AM_V_UPP = $(am__v_UPP_@AM_V@)
     502am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
     503am__v_UPP_0 = @echo "  UPP     " $@;
     504am__v_UPP_1 =
    481505repeats = 10
    482506max_time = 600
     
    484508debug = -debug
    485509type = LONG
    486 REPEAT = ${abs_top_srcdir}/tools/repeat
    487 WATCHDOG = ${abs_top_srcdir}/tools/watchdog
     510REPEAT = $(abs_top_builddir)/tools/repeat
     511WATCHDOG = $(abs_top_builddir)/tools/watchdog
    488512TIME = /usr/bin/time -f "%E"
    489 
    490 # $(shell ./update-type $(type))
    491 # ./update-type $(type)
    492 UPDATED_TYPE = $(shell ./update-type $(type))
    493 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I../tests -I. -DTEST_$(shell cat .type | tr a-z A-Z)
     513UPDATED_TYPE = $(shell $(srcdir)/update-type $(type))
     514BUILD_FLAGS =
     515AM_CFAFLAGS = \
     516        -g \
     517        -Wall \
     518        -Wno-unused-function \
     519        -quiet \
     520        -O2 \
     521        -DPREEMPTION_RATE=$(preempt) \
     522        -I$(abs_top_srcdir)/tests \
     523        -I$(srcdir) \
     524        -DTEST_$(shell cat .type | tr a-z A-Z) \
     525        -in-tree
     526
    494527TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
    495528all: all-am
    496529
    497530.SUFFIXES:
    498 .SUFFIXES: .log .test .test$(EXEEXT) .trs
    499 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(am__configure_deps)
     531.SUFFIXES: .cfa .lo .log .o .test .test$(EXEEXT) .trs
     532$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    500533        @for dep in $?; do \
    501534          case '$(am__configure_deps)' in \
     
    517550            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    518551        esac;
     552$(top_srcdir)/src/cfa.make $(am__empty):
    519553
    520554$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     
    917951
    918952
    919 # .INTERMEDIATE: ${TESTS}
    920 
    921 all-local: ${TESTS:=.run}
    922 
    923 runall : ${TESTS:=.run}
     953.cfa.o:
     954        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     955        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     956        $(am__mv) $$depbase.Tpo $$depbase.Po
     957
     958.cfa.lo:
     959        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     960        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     961        $(am__mv) $$depbase.Tpo $$depbase.Plo
     962
     963# .INTERMEDIATE: $(TESTS)
     964
     965all-local: $(TESTS:=.run)
     966
     967runall : $(TESTS:=.run)
    924968        @ echo "All programs terminated normally"
    925969
    926 watchall : ${TESTS:=.watch}
     970watchall : $(TESTS:=.watch)
    927971        @ echo "All programs terminated normally"
    928972
    929 compileall : ${TESTS}
     973compileall : $(TESTS)
    930974        @ echo "Compiled"
    931975
    932976clean-local:
    933         rm -f ${TESTS} core* out.log .type
    934 
    935 % : %.c ${CC} ${UPDATED_TYPE}
    936         ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
    937 
    938 %.run : % ${REPEAT}
    939         @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
    940         @ rm ${<}
    941         @ echo -e "${<}: SUCCESS\n"
    942 
    943 %.watch : % ${WATCHDOG}
    944         @ time ${WATCHDOG} ./${<}
    945         @ rm ${<}
    946         @ echo -e "${<}: SUCCESS\n"
    947 
    948 %.time : % ${REPEAT}
    949         @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
    950         @ rm ${<}
    951         @ echo -e "${<}: SUCCESS\n"
    952 
    953 ${REPEAT}: ${abs_top_srcdir}/tools/Makefile
    954         @+make -C ${abs_top_srcdir}/tools/
    955 
    956 ${WATCHDOG}: ${abs_top_srcdir}/tools/Makefile
    957         @+make -C ${abs_top_srcdir}/tools/
     977        rm -f $(TESTS) core* out.log .type
     978
     979% : %.cfa $(CFACC) $(UPDATED_TYPE)
     980        $(AM_V_CFA)$(CFACOMPILE) $(<) $(debug) -o $(@)
     981
     982%.run : % $(REPEAT)
     983        @ time $(REPEAT) -r out.log -i -s $(repeats) timeout $(max_time) ./$(<)
     984        @ rm $(<)
     985        @ echo -e "$(<): SUCCESS\n"
     986
     987%.watch : % $(WATCHDOG)
     988        @ time $(WATCHDOG} ./$(<)
     989        @ rm $(<)
     990        @ echo -e "$(<): SUCCESS\n"
     991
     992%.time : % $(REPEAT)
     993        @ $(REPEAT) -i -s -- $(repeats) $(TIME) -a -o times.log ./$(<)
     994        @ rm $(<)
     995        @ echo -e "$(<): SUCCESS\n"
     996
     997$(REPEAT): $(abs_top_builddir)/tools/Makefile
     998        @+make -C $(abs_top_builddir)/tools/
     999
     1000$(WATCHDOG): $(abs_top_builddir)/tools/Makefile
     1001        @+make -C $(abs_top_builddir)/tools/
    9581002
    9591003# Tell versions [3.59,3.63) of GNU make to not export all variables.
  • longrun_tests/enter.cfa

    r1241851 re8fe5e0  
    55
    66#define __kick_rate 75000ul
    7 #include "long_tests.h"
     7#include "long_tests.hfa"
    88
    99#ifndef PREEMPTION_RATE
  • longrun_tests/stack.cfa

    r1241851 re8fe5e0  
    55
    66#define __kick_rate 5000000ul
    7 #include "long_tests.h"
     7#include "long_tests.hfa"
    88
    99#ifndef PREEMPTION_RATE
Note: See TracChangeset for help on using the changeset viewer.