interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into features/zeroconf-dnssec

This commit is contained in:
Willem Toorop 2017-09-13 16:56:33 +02:00
parent 8f3ce9af35 645c6f31cc
commit 92a0db58da
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/tpkg/tpkg
View File

@ -197,6 +197,7 @@ function usage() {
out " -b DIR\tuse DIR is a base directory in stead of ." out " -b DIR\tuse DIR is a base directory in stead of ."
out " -a ARGS\tpass the string ARGS through to the test scripts" out " -a ARGS\tpass the string ARGS through to the test scripts"
out " -d\t\tUse directories instead of tar.gz for tpkg archive format" out " -d\t\tUse directories instead of tar.gz for tpkg archive format"
out " -f\t\tForce test to be re-run if already executed"
out out
out " (C) NLnetLabs, Miek Gieben. Licensed under the GPL version 2." out " (C) NLnetLabs, Miek Gieben. Licensed under the GPL version 2."
} }
@ -858,9 +859,10 @@ echo "--------------- Test Output ------------------" | write_result result.$dsc
pre pre
out "[log] Executing test" out "[log] Executing test"
( ${SHELL} $dsc_test ${TPKG_ARGS} 2>&1 ) > result.$dsc_basename.tmp
( ${SHELL} $dsc_test ${TPKG_ARGS} 2>&1 ) | write_result result.$dsc_basename
test_result=$? test_result=$?
write_result result.$dsc_basename < result.$dsc_basename.tmp
rm -f result.$dsc_basename.tmp
epoch # would like to run after post, but that is not possible :-( epoch # would like to run after post, but that is not possible :-(
if [ $test_result -ne 0 ]; then if [ $test_result -ne 0 ]; then
err "[warning] Test executed with errors: $test_result." err "[warning] Test executed with errors: $test_result."