This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, devel has been updated via 437451dcd1345eb5e1a0a08315f391ae285dd78e (commit) from 481c3c6d8649efdf73a5570f0ef95196f9243bc5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 437451dcd1345eb5e1a0a08315f391ae285dd78e Author: Dries Kimpe <[email protected]> Date: Thu Jul 18 17:17:35 2013 -0500 Fixup for last commit ----------------------------------------------------------------------- Summary of changes: Makefile.in | 86 +++++++++++++++++++-------------------------------------- configure.ac | 10 ++++--- 2 files changed, 35 insertions(+), 61 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index 61d4e49..c207eb4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,7 +39,7 @@ bindir = $(DESTDIR)@bindir@ libdir = $(DESTDIR)@libdir@ # tests -TEST_RUNNER=@TEST_RUNNER@ +TEST_RUNNER=${builddir}/tests/testrunner.sh # tools A2X = @A2X@ @@ -148,8 +148,6 @@ HSSRC := HSBINSRC := TESTSRC := PROGRAMSRC := -TEST_OUT := -TEST_RESULTS := ASCIIDOCSRC := @@ -199,7 +197,7 @@ endif # of a file that has the same name as the target. Listing them # here keeps make from accidentally doing too much work (see GNU # make manual). -.PHONY: all clean parserclean test_results +.PHONY: all clean parserclean ################################################################ # Find project subdirectories @@ -320,9 +318,6 @@ MCC_AER = $(call modcc,$(1)) MCC_AE = $(call modcc,$(1)) MCC_C = $(call modcc,$(1)) -# Get the parameters for a given test -testparams = $(TESTPARAMS_$(1)) - # The object files for the triton library generated from .ae files AELIBOBJS=$(patsubst %.ae,%.o,$(AELIBSRC)) aelibobjs: $(AELIBOBJS) @@ -378,10 +373,6 @@ PROGRAMS = $(AEPROGRAM) $(PROGRAM) TESTS = $(AETEST) $(TEST) -# TODO: Need a way to take mpiexec tests out of this -runTESTS = $(patsubst %,run%,$(TESTS)) -runVALGRIND = $(patsubst %,valgrind%,$(TESTS)) - # for now we just use static if we're not on a mac ifneq (,$(USE_DYLIBS)) LIBRARIES=lib/libaesop.dylib @@ -549,18 +540,9 @@ $(HSBIN): %: $(srcdir)/%.lhs $(HSSRC) all:: $(PROGRAMS) $(LIBRARIES) -$(runTESTS): run%: % - @if test -n "$(call testparams,$<)"; then \ - for p in $(call testparams,$<); do \ - echo -n "Running $< $$p..."; \ - $(TEST_RUNNER) ./$< $$p > /dev/null && echo OK || echo FAILED; \ - done \ - else \ - echo -n "Running $<..."; \ - $(TEST_RUNNER) ./$< > /dev/null && echo OK || echo FAILED;\ - fi - -check: $(runTESTS) test_results +.PHONY: check +check: $(TESTS) + @$(TEST_RUNNER) -o ${builddir}/tests/test_results.tap $(TESTS) .PHONY: tests tests: test @@ -568,39 +550,29 @@ tests: test .PHONY: test test: $(TESTS) -test_results: $(TEST_RESULTS) - -$(runVALGRIND): valgrind%: % - @if test -n "$(call testparams,$<)"; then \ - for p in $(call testparams,$<); do \ - echo -n "Running valgrind $< $$p..."; \ - valgrind --error-exitcode=1 ./$< $$p > /dev/null 2>./.vout; \ - grep "All heap blocks were freed" ./.vout >/dev/null 2>&1; \ - if test $$? != 0; then \ - echo "\nErrors found in $<. Rerun valgrind ./$<"; \ - exit 1; \ - fi; \ - echo "done."; \ - done; \ - else \ - echo -n "Running valgrind $<..."; \ - valgrind --error-exitcode=1 ./$< > /dev/null 2>./.vout; \ - grep "All heap blocks were freed" ./.vout >/dev/null 2>&1; \ - if test $$? != 0; then \ - echo "\nErrors found in $<. Rerun valgrind ./$<"; \ - exit 1; \ - fi; \ - echo "done."; \ - fi - -runvalgrind: $(runVALGRIND) - -%.result: % %.sh - $(Q) " SH $@" - $(E) SRCDIR=$(srcdir) $(srcdir)/$(patsubst %,%.sh,$<) > \ - $*.tmp 2>&1 - $(E) mv $*.tmp $@ - $(E) echo -n " $@ : " && cat $@ +#$(runVALGRIND): valgrind%: % +# @if test -n "$(call testparams,$<)"; then \ +# for p in $(call testparams,$<); do \ +# echo -n "Running valgrind $< $$p..."; \ +# valgrind --error-exitcode=1 ./$< $$p > /dev/null 2>./.vout; \ +# grep "All heap blocks were freed" ./.vout >/dev/null 2>&1; \ +# if test $$? != 0; then \ +# echo "\nErrors found in $<. Rerun valgrind ./$<"; \ +# exit 1; \ +# fi; \ +# echo "done."; \ +# done; \ +# else \ +# echo -n "Running valgrind $<..."; \ +# valgrind --error-exitcode=1 ./$< > /dev/null 2>./.vout; \ +# grep "All heap blocks were freed" ./.vout >/dev/null 2>&1; \ +# if test $$? != 0; then \ +# echo "\nErrors found in $<. Rerun valgrind ./$<"; \ +# exit 1; \ +# fi; \ +# echo "done."; \ +# fi +# # other intermediates may exist from aecc and aercc INTERM_AESRC=$(patsubst %.o,%.ae.s,$(AEOBJS)) @@ -615,7 +587,7 @@ clean:: docclean $(Q) " CLEAN" $(E)rm -f $(AEOBJS) $(LIBOBJS) $(GENLIBOBJS) $(AETEST) $(AEPROGRAM) $(TEST) $(PROGRAM) \ $(AESOP_TRHDR) $(TESTLIBOBJS) \ - $(LIBRARIES) $(TEST_LIBRARIES) $(DEPENDS) $(TEST_RESULTS) $(TEST_OUT) \ + $(LIBRARIES) $(TEST_LIBRARIES) $(DEPENDS) \ $(INTERM) parserclean:: diff --git a/configure.ac b/configure.ac index fa9bc16..84d8200 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ AX_GHC("") dnl ==================================================== dnl = Find timeout program to safely run tests for now = dnl ==================================================== +TIMEOUT_PROG= AC_CHECK_PROGS(TIMEOUT_PROG,[timeout]) -TEST_RUNNER= -if test -n ${TIMEOUT_PROG}; then - TEST_RUNNER="${TIMEOUT_PROG} -k 400 300" +if test -z "$TIMEOUT_PROG"; then + AC_MSG_ERROR("Could not find 'timeout' program!") fi -AC_SUBST(TEST_RUNNER) +AC_SUBST(TIMEOUT_PROG) dnl ====================================================================== dnl Try harder to be valgrind safe @@ -368,6 +368,8 @@ AC_SUBST(AESOP_PKGCONFIG_LIBS) AC_CONFIG_FILES([bin/aecc-utils], []) AC_CONFIG_FILES([bin/aecc], [chmod +x bin/aecc]) +AC_CONFIG_FILES([tests/testrunner.sh], [chmod +x tests/testrunner.sh]) + AC_OUTPUT([Makefile resources/worker/module.mk resources/worker/test/module.mk hooks/post-receive --