July 2013 - Asg - mailman3.cels.anl.gov

branch, devel, updated. 3a6273b2c4f04190a58c9fdecd2730e27e512582
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 3a6273b2c4f04190a58c9fdecd2730e27e512582 (commit) from 2abd8c6fddd4cfc0bfbff49ea2e90d13e090db2b (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 3a6273b2c4f04190a58c9fdecd2730e27e512582 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Jul 18 20:33:36 2013 -0500 tap4j (jenkins) doesn't seem to follow TAP specs... Including extra output seems to cause the tap4j parser to fail. Try making it directives instead. ----------------------------------------------------------------------- Summary of changes: tests/testrunner.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Diff of changes: diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in index 30b1c64..8a65d4c 100644 --- a/tests/testrunner.sh.in +++ b/tests/testrunner.sh.in @@ -64,8 +64,8 @@ for test in $*; do 137) status="TIMEOUT(KILL)"; directive="#timeout-killed" ;; esac echo "${tap} ${testnumber} - ${test} ${directive}" >&3 - cat ${TMPERR} | sed -e 's/^/ + /g' >&4 - cat ${TMPOUT} | sed -e 's/^/ | /g' >&4 + cat ${TMPERR} | sed -e 's/^/# + /g' >&4 + cat ${TMPOUT} | sed -e 's/^/# | /g' >&4 echo -e " # ${status}\t [${testnumber}/${TESTCOUNT}] - $test" >&2 cat ${TMPERR} | sed -e 's/^/ # + /g' >&2 hooks/post-receive --

1 0

branch, devel, updated. 2abd8c6fddd4cfc0bfbff49ea2e90d13e090db2b
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 2abd8c6fddd4cfc0bfbff49ea2e90d13e090db2b (commit) from 60e1809537b60888eada8e756cbf69ebb744faae (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 2abd8c6fddd4cfc0bfbff49ea2e90d13e090db2b Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Jul 18 19:11:55 2013 -0500 Error output to correct FD in testrunner ----------------------------------------------------------------------- Summary of changes: tests/testrunner.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Diff of changes: diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in index 8e48249..30b1c64 100644 --- a/tests/testrunner.sh.in +++ b/tests/testrunner.sh.in @@ -66,9 +66,10 @@ for test in $*; do echo "${tap} ${testnumber} - ${test} ${directive}" >&3 cat ${TMPERR} | sed -e 's/^/ + /g' >&4 cat ${TMPOUT} | sed -e 's/^/ | /g' >&4 - cat ${TMPERR} | sed -e 's/^/ # + /g' - rm ${TMPOUT} ${TMPERR} echo -e " # ${status}\t [${testnumber}/${TESTCOUNT}] - $test" >&2 + cat ${TMPERR} | sed -e 's/^/ # + /g' >&2 + + rm ${TMPOUT} ${TMPERR} if test "${ret}" -eq 130; then echo "Ctrl-C received. Stopping tests" hooks/post-receive --

1 0

branch, devel, updated. 60e1809537b60888eada8e756cbf69ebb744faae
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 60e1809537b60888eada8e756cbf69ebb744faae (commit) from cd55170c252e18103709556b0c864b8abcd24773 (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 60e1809537b60888eada8e756cbf69ebb744faae Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Jul 18 18:45:41 2013 -0500 Also include stderr in output of TAP report ----------------------------------------------------------------------- Summary of changes: tests/testrunner.sh.in | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) Diff of changes: diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in index bf2dd99..8e48249 100644 --- a/tests/testrunner.sh.in +++ b/tests/testrunner.sh.in @@ -47,11 +47,15 @@ echo "1..${TESTCOUNT}" >&3 testnumber=0 +TMPOUT=$(mktemp) +TMPERR=$(mktemp) + for test in $*; do testnumber=$((testnumber+1)) - output="$(${TEST_RUNNER} -k ${opt_kill} $opt_timeout $test)" + ${TEST_RUNNER} -k ${opt_kill} $opt_timeout $test >"${TMPOUT}" 2>"${TMPERR}" ret=$? tap="not ok" + status="FAILED" directive="" case ${ret} in 0) tap="ok" status="ok";; @@ -60,7 +64,10 @@ for test in $*; do 137) status="TIMEOUT(KILL)"; directive="#timeout-killed" ;; esac echo "${tap} ${testnumber} - ${test} ${directive}" >&3 - test -n "${output}" && echo "${output}" | sed -e 's/^/ | /g' >&4 + cat ${TMPERR} | sed -e 's/^/ + /g' >&4 + cat ${TMPOUT} | sed -e 's/^/ | /g' >&4 + cat ${TMPERR} | sed -e 's/^/ # + /g' + rm ${TMPOUT} ${TMPERR} echo -e " # ${status}\t [${testnumber}/${TESTCOUNT}] - $test" >&2 if test "${ret}" -eq 130; then hooks/post-receive --

1 0

branch, devel, updated. cd55170c252e18103709556b0c864b8abcd24773
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 cd55170c252e18103709556b0c864b8abcd24773 (commit) from ad346b3f90f74121529c065c84c75fc1f58f8b69 (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 cd55170c252e18103709556b0c864b8abcd24773 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Jul 18 18:12:45 2013 -0500 Updates to test runner - Include test output in TAP output - Reduce default timeout to 300s (THis will fail some of the slower tests, but those tests will simply have to be fixed) ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- tests/testrunner.sh.in | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index c207eb4..5e3badf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -542,7 +542,7 @@ all:: $(PROGRAMS) $(LIBRARIES) .PHONY: check check: $(TESTS) - @$(TEST_RUNNER) -o ${builddir}/tests/test_results.tap $(TESTS) + @$(TEST_RUNNER) -v -o ${builddir}/tests/test_results.tap $(TESTS) .PHONY: tests tests: test diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in index f7d0061..bf2dd99 100644 --- a/tests/testrunner.sh.in +++ b/tests/testrunner.sh.in @@ -8,7 +8,7 @@ TEST_RUNNER="@TIMEOUT_PROG@" opt_verbose= -opt_timeout=600 +opt_timeout=300 opt_outputfile= opt_kill="$((opt_timeout+60))" while getopts vk:t:o: name @@ -39,7 +39,7 @@ if test -z "$opt_verbose" ; then exec 4>/dev/null; # exec 5>/dev/null; else - exec 4>&0; + exec 4>&3; # exec 2>&5; fi @@ -49,7 +49,7 @@ testnumber=0 for test in $*; do testnumber=$((testnumber+1)) - ${TEST_RUNNER} -k ${opt_kill} $opt_timeout "$test" >&4 + output="$(${TEST_RUNNER} -k ${opt_kill} $opt_timeout $test)" ret=$? tap="not ok" directive="" @@ -60,6 +60,7 @@ for test in $*; do 137) status="TIMEOUT(KILL)"; directive="#timeout-killed" ;; esac echo "${tap} ${testnumber} - ${test} ${directive}" >&3 + test -n "${output}" && echo "${output}" | sed -e 's/^/ | /g' >&4 echo -e " # ${status}\t [${testnumber}/${TESTCOUNT}] - $test" >&2 if test "${ret}" -eq 130; then hooks/post-receive --

1 0

branch, devel, updated. ad346b3f90f74121529c065c84c75fc1f58f8b69
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 ad346b3f90f74121529c065c84c75fc1f58f8b69 (commit) from 437451dcd1345eb5e1a0a08315f391ae285dd78e (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 ad346b3f90f74121529c065c84c75fc1f58f8b69 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Jul 18 17:53:43 2013 -0500 Some updates to testrunner script Properly detect timeout/ctrl-c ----------------------------------------------------------------------- Summary of changes: tests/testrunner.sh.in | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) Diff of changes: diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in index e1084a5..f7d0061 100644 --- a/tests/testrunner.sh.in +++ b/tests/testrunner.sh.in @@ -10,11 +10,13 @@ TEST_RUNNER="@TIMEOUT_PROG@" opt_verbose= opt_timeout=600 opt_outputfile= -while getopts vt:o: name +opt_kill="$((opt_timeout+60))" +while getopts vk:t:o: name do case $name in t) opt_timeout="$OPTARG";; v) opt_verbose=1 ;; + k) opt_kill="$OPTARG";; o) opt_outputfile="$OPTARG";; ?) printf "Usage: %s: [-o outputfile] [-v] [-t timeout] test test test\n" $0 exit 2;; @@ -47,17 +49,19 @@ testnumber=0 for test in $*; do testnumber=$((testnumber+1)) - ${TEST_RUNNER} $opt_timeout "$test" | sed -e 's/^/# /' >&4 + ${TEST_RUNNER} -k ${opt_kill} $opt_timeout "$test" >&4 ret=$? - if test "${ret}" -eq 0; then - echo -n "ok " >&3 - echo "${testnumber} - ${test}" >&3 - echo -e " # OK\t [${testnumber}/${TESTCOUNT}] - $test" >&2 - else - echo -n "not ok " >&3 - echo "${testnumber} - ${test}" >&3 - echo -e " # FAIL\t [${testnumber}/${TESTCOUNT}] - $test" >&2 - fi + tap="not ok" + directive="" + case ${ret} in + 0) tap="ok" status="ok";; + 130) status="[interrupted]"; directive="# Ctrl-C received; test interrupted" ;; + 124) status="TIMEOUT"; directive="#timeout" ;; + 137) status="TIMEOUT(KILL)"; directive="#timeout-killed" ;; + esac + echo "${tap} ${testnumber} - ${test} ${directive}" >&3 + echo -e " # ${status}\t [${testnumber}/${TESTCOUNT}] - $test" >&2 + if test "${ret}" -eq 130; then echo "Ctrl-C received. Stopping tests" exit 2 hooks/post-receive --

1 0

branch, devel, updated. 437451dcd1345eb5e1a0a08315f391ae285dd78e
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 <dkimpe(a)mcs.anl.gov> 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 --

1 0

branch, devel, updated. 481c3c6d8649efdf73a5570f0ef95196f9243bc5
by noreply＠mcs.anl.gov 18 Jul '13

18 Jul '13

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 481c3c6d8649efdf73a5570f0ef95196f9243bc5 (commit) from 679438ccf55d90a97b0767b384a66be8067c33ff (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 481c3c6d8649efdf73a5570f0ef95196f9243bc5 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Jul 18 17:15:33 2013 -0500 Make tests output TAP format for Jenkins ----------------------------------------------------------------------- Summary of changes: tests/testrunner.sh.in | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 tests/testrunner.sh.in Diff of changes: diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in new file mode 100644 index 0000000..e1084a5 --- /dev/null +++ b/tests/testrunner.sh.in @@ -0,0 +1,67 @@ +#!/bin/sh + +# +# Runs each test listed on the commandline, watching the process and killing after a timeout. +# Outputs TAP format +# + +TEST_RUNNER="@TIMEOUT_PROG@" + +opt_verbose= +opt_timeout=600 +opt_outputfile= +while getopts vt:o: name +do + case $name in + t) opt_timeout="$OPTARG";; + v) opt_verbose=1 ;; + o) opt_outputfile="$OPTARG";; + ?) printf "Usage: %s: [-o outputfile] [-v] [-t timeout] test test test\n" $0 + exit 2;; + esac +done +shift $(($OPTIND - 1)) + +TESTCOUNT=$# + +# 3 is for TAP output +if test -z "$opt_outputfile" ; then + exec 3>&0; +else + exec 3>${opt_outputfile}; +fi + +# 4 is for program stdout +# 5 is for program stderr +if test -z "$opt_verbose" ; then + exec 4>/dev/null; +# exec 5>/dev/null; +else + exec 4>&0; +# exec 2>&5; +fi + +echo "1..${TESTCOUNT}" >&3 + +testnumber=0 + +for test in $*; do + testnumber=$((testnumber+1)) + ${TEST_RUNNER} $opt_timeout "$test" | sed -e 's/^/# /' >&4 + ret=$? + if test "${ret}" -eq 0; then + echo -n "ok " >&3 + echo "${testnumber} - ${test}" >&3 + echo -e " # OK\t [${testnumber}/${TESTCOUNT}] - $test" >&2 + else + echo -n "not ok " >&3 + echo "${testnumber} - ${test}" >&3 + echo -e " # FAIL\t [${testnumber}/${TESTCOUNT}] - $test" >&2 + fi + if test "${ret}" -eq 130; then + echo "Ctrl-C received. Stopping tests" + exit 2 + fi +done + + hooks/post-receive --

1 0

branch, devel, updated. 679438ccf55d90a97b0767b384a66be8067c33ff
by noreply＠mcs.anl.gov 17 Jul '13

17 Jul '13

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 679438ccf55d90a97b0767b384a66be8067c33ff (commit) from 46ab6688ffb1e34dd20410f4064f51bb6b0b18da (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 679438ccf55d90a97b0767b384a66be8067c33ff Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Jul 17 11:21:05 2013 -0500 Remove --timeout; Not supported everywhere ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/configure.ac b/configure.ac index fcf8c3a..fa9bc16 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ dnl ==================================================== AC_CHECK_PROGS(TIMEOUT_PROG,[timeout]) TEST_RUNNER= if test -n ${TIMEOUT_PROG}; then - TEST_RUNNER="${TIMEOUT_PROG} -k 400s 300s --foreground" + TEST_RUNNER="${TIMEOUT_PROG} -k 400 300" fi AC_SUBST(TEST_RUNNER) hooks/post-receive --

1 0

branch, devel, updated. 46ab6688ffb1e34dd20410f4064f51bb6b0b18da
by noreply＠mcs.anl.gov 17 Jul '13

17 Jul '13

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 46ab6688ffb1e34dd20410f4064f51bb6b0b18da (commit) from 95bdc8c232266016ad886b64f589b85b466bdec1 (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 46ab6688ffb1e34dd20410f4064f51bb6b0b18da Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Jul 17 11:02:30 2013 -0500 Make sure tests can't hang ----------------------------------------------------------------------- Summary of changes: Makefile.in | 9 +++++---- configure.ac | 11 +++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index fb959d8..61d4e49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,6 +38,9 @@ sbindir = $(DESTDIR)@sbindir@ bindir = $(DESTDIR)@bindir@ libdir = $(DESTDIR)@libdir@ +# tests +TEST_RUNNER=@TEST_RUNNER@ + # tools A2X = @A2X@ ASCIIDOC = @ASCIIDOC@ @@ -550,13 +553,11 @@ $(runTESTS): run%: % @if test -n "$(call testparams,$<)"; then \ for p in $(call testparams,$<); do \ echo -n "Running $< $$p..."; \ - ./$< $$p > /dev/null; \ - echo "done."; \ + $(TEST_RUNNER) ./$< $$p > /dev/null && echo OK || echo FAILED; \ done \ else \ echo -n "Running $<..."; \ - ./$< > /dev/null; \ - echo "done."; \ + $(TEST_RUNNER) ./$< > /dev/null && echo OK || echo FAILED;\ fi check: $(runTESTS) test_results diff --git a/configure.ac b/configure.ac index 3602806..fcf8c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,17 @@ fi AX_GHC("") + +dnl ==================================================== +dnl = Find timeout program to safely run tests for now = +dnl ==================================================== +AC_CHECK_PROGS(TIMEOUT_PROG,[timeout]) +TEST_RUNNER= +if test -n ${TIMEOUT_PROG}; then + TEST_RUNNER="${TIMEOUT_PROG} -k 400s 300s --foreground" +fi +AC_SUBST(TEST_RUNNER) + dnl ====================================================================== dnl Try harder to be valgrind safe dnl ====================================================================== hooks/post-receive --

1 0

20130715 - Sandia Weekly Status
by Danielson, Geoffrey Charles 16 Jul '13

16 Jul '13

All, Last week Sandia continued work on milestone-related improvements to Sirocco: * New API for client-server communication (avoiding excessive teardowns and setups of the SSM subsystem) * Lock service integration with the client continues Regards, Geoff Danielson HP ES gcdanie(a)sandia.gov Geoffrey.Danielson(a)hp.com Desk: 505-844-8109 Cell: 505-263-0751

2 3