Some more shellcheck errors & warnings

diff --git a/test/test_all.sh b/test/test_all.sh
index 32bdf19770072892f1eecc0cdb6c8169f83c1c0d..38571486b976aa77b200a712b3c4b9683a36c37e 100755 (executable)
--- a/test/test_all.sh
+++ b/test/test_all.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
 # do ldns tests
-cd test
+cd test || echo "Must be executed from srcdir" && exit -1
 . common.sh
 
 # find tpkg
-if [ -z "$TPKG" -o ! -x "$TPKG" ]
+if [ -z "$TPKG" ] || [ ! -x "$TPKG" ]
 then
         if [ -x tpkg/tpkg ]            ; then TPKG="$(pwd)/tpkg/tpkg"
         elif [ -x test/tpkg/tpkg ]     ; then TPKG="$(pwd)/test/tpkg/tpkg"
@@ -29,7 +29,7 @@ echo start the test at "$(date)" in "$(pwd)"
 $TPKG -a ../.. fake 01-compile.tpkg
 
 # Works only on FreeBSD really
-if [[ "$is_freebsd" -ne 0 ]]; then
+if [[ "$is_freebsd" -eq 0 ]]; then
     $TPKG -a ../.. fake 02-lint.tpkg
 fi
 

diff --git a/test/test_ci.sh b/test/test_ci.sh
index 23a71a57d334058ae03aafaf9697104a8eb982ec..93dee72e6a97d5964657dd4b93d02dfcf7d343d6 100755 (executable)
--- a/test/test_ci.sh
+++ b/test/test_ci.sh
@@ -5,7 +5,7 @@ echo "PATH=$PATH" > "$BUILD_DIR/test/.tpkg.var.master"
 
 if git log HEAD^..HEAD | grep -q 'git:TEST [0-9][0-9]*'
 then
-       ONLY_TEST=$( ( cd "$BUILD_DIR" ; git log HEAD^..HEAD ) | grep 'git:TEST [0-9][0-9]*' | sed 's/^.*git:TEST \([0-9][0-9]*\).*$/\1/g')
+       ONLY_TEST=$(git log HEAD^..HEAD | grep 'git:TEST [0-9][0-9]*' | sed 's/^.*git:TEST \([0-9][0-9]*\).*$/\1/g')
 else
        ONLY_TEST=""
 fi
@@ -32,7 +32,7 @@ fi
 for tests in "$BUILD_DIR"/test/*.tpkg
 do
        TESTFN="$(basename "$tests")"
-       TESTNR="$(echo "$TESTFN" | sed 's/-.*$//g')"
+       TESTNR=${TESTNR%-*}
        [ -n "$ONLY_TEST" ] && [ x"$ONLY_TEST" != x"$TESTNR" ] && continue
        case "$TESTNR" in
        [3-5][0-9]*)    [ $NO_REGRESSION = 1 ] && continue
@@ -51,5 +51,5 @@ do
        $TPKG -b "$BUILD_DIR/test" -a "$BUILD_DIR" exe "$TESTFN"
 done
 
-cd test
-exec $TPKG -n -1 r
\ No newline at end of file
+cd test || echo "Where is the test directory?" && exit 1
+exec "$TPKG" -n -1 r