diff options
| -rwxr-xr-x | run | 42 |
1 files changed, 22 insertions, 20 deletions
@@ -3,7 +3,7 @@ ## CONFIG ## export dtf_resultdir=${dtf_resultdir_override-/var/tmp/dtf} -export dtf_srcdir=$(dirname $(readlink -f ${BASH_SOURCE[0]})) +export dtf_srcdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") export dtf_testdir=${dtf_testdir-$dtf_srcdir} export dtf_resultxml_file=/var/tmp/dtf.xml @@ -13,7 +13,7 @@ export dtf_option_force=0 export dtf_option_testids="" export dtf_option_listonly=0 -. $dtf_srcdir/lib.sh +. "$dtf_srcdir/lib.sh" ## F.DEFS ## @@ -34,9 +34,9 @@ die() run() { export dtf_workdir=$1 - export dtf_test_id=`basename $dtf_workdir` + export dtf_test_id=$(basename "$dtf_workdir") - dtf_resultxml_cache "$( cd $dtf_workdir + dtf_resultxml_cache "$( cd "$dtf_workdir" . ./config.sh echo "<test>" echo "<id>$DTF_TEST_ID</id>" @@ -45,7 +45,7 @@ run() echo "</description>" )" - ( cd $dtf_workdir + ( cd "$dtf_workdir" outlog="$dtf_resultdir/$dtf_test_id.log" output_wrapper="cat > $outlog" @@ -60,7 +60,7 @@ run() . ./config.sh if test "$dtf_option_listonly" -eq 1; then - echo $DTF_TEST_ID + echo "$DTF_TEST_ID" exit 0 fi @@ -72,14 +72,14 @@ run() set -o pipefail - ( . $dtf_srcdir/lib.sh || exit 1 + ( . "$dtf_srcdir/lib.sh" || exit 1 . ./config.sh . ./runtest.sh rv=$? test -n "$DTF_RESULT_TARBALL" \ - && cp "$DTF_RESULT_TARBALL" $dtf_resultdir/$dtf_test_id.tar.gz + && cp "$DTF_RESULT_TARBALL" "$dtf_resultdir/$dtf_test_id.tar.gz" { echo "---" echo "exit_status: $rv" @@ -87,7 +87,7 @@ run() } >> "$dtf_resultdir/$dtf_test_id.result" exit $rv - ) 2>&1 | eval $output_wrapper + ) 2>&1 | eval "$output_wrapper" rv=$? test $rv -eq 0 && echo "[ OK ]" || echo "[ FAIL ]" @@ -100,7 +100,7 @@ prepare_resultdir() if test -e "$dtf_resultdir"; then test $dtf_option_force -eq 0 && die "result dir $dtf_resultdir exits" - rm -rf $dtf_resultdir || die "can not remove $dtf_resultdir" + rm -rf "$dtf_resultdir" || die "can not remove $dtf_resultdir" fi mkdir -p "$dtf_resultdir" || die "can not create $dtf_resultdir" @@ -120,11 +120,11 @@ Options: --verbose Show complete output from each test --help Show this help EOHELP -test -n "$1" && exit $1 +test -n "$1" && exit "$1" } longopts="verbose,help,force,testid:,listonly" -ARGS=`getopt -o "v" -l "$longopts" -n "getopt" -- "$@"` +ARGS=$(getopt -o "v" -l "$longopts" -n "getopt" -- "$@") if [ $? -ne 0 ]; then echo "getopt error" exit 1 @@ -163,14 +163,16 @@ test $dtf_option_listonly -ne 1 && prepare_resultdir dtf_resultxml_init "$dtf_resultxml_file" result=0 -for i in `find $dtf_testdir -name runtest.sh`; do - testdir=`dirname $i` - run $testdir || result=1 - - test $result -eq 0 \ - && dtf_resultxml_cache "<result>Success</result></test>" \ - || dtf_resultxml_cache "<result>Fail</result></test>" -done +for i in ; do + testdir=$(dirname "$i") + run "$testdir" || result=1 + + if test $result -eq 0; then + dtf_resultxml_cache "<result>Success</result></test>" + else + dtf_resultxml_cache "<result>Fail</result></test>" + fi +done <<<"$(find "$dtf_testdir" -name runtest.sh)" dtf_resultxml_finish exit $result |