From 9f11b381ef26eb265d4ec851bde3decfd69bb2aa Mon Sep 17 00:00:00 2001 From: edoapra Date: Mon, 4 Dec 2017 19:03:55 -0800 Subject: [PATCH] ugly hack to get sleep_loopqa.sh to digest 6 or 7 args --- .travis.yml | 1 + QA/sleep_loopqa.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e58dc28613..d749a04a34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,5 @@ after_failure: - grep d= $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out - grep @ $TRAVIS_BUILD_DIR/QA/testoutputs/h2o_opt.out - cat $TRAVIS_BUILD_DIR/QA/testoutputs/dft_he2+.out + - cat $TRAVIS_BUILD_DIR/QA/testoutputs/prop_mep_gcube.out diff --git a/QA/sleep_loopqa.sh b/QA/sleep_loopqa.sh index ed1477d086..e4d4af8789 100755 --- a/QA/sleep_loopqa.sh +++ b/QA/sleep_loopqa.sh @@ -1,9 +1,14 @@ #!/bin/bash #echo "starting sleep_loop.sh for command: " ${@} #"${@}" & -outfile=../testoutputs/"$6" -#echo "output file is "$outfile -$1 $2 $3 $4 $5 >& $outfile & +narg="${#}" +if [ "$narg" -eq 7 ]; then + outfile=../testoutputs/$7 + $1 $2 $3 $4 $5 $6 >& $outfile & +else + outfile=../testoutputs/$6 + $1 $2 $3 $4 $5 >& $outfile & +fi pid=$! echo "sleep_loopqa got pid" $pid ps -p "$pid" > /dev/null @@ -19,8 +24,6 @@ else if [[ "$ps_exit" -eq 0 ]]; then echo ' ==== ' `date` ' ==== ' tail -1 $outfile -# elif wait "$pid"; then - # echo "ps_exit code" $ps_exit else break # exit loop. fi