From: Mark Andrews <marka@isc.org>
Date: Thu, 26 Nov 2020 17:13:27 +0000 (+0100)
Subject: Unify whitespace in bin/tests/system/run.sh
X-Git-Tag: v9.16.10~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a50ce1bd43dd3fd76b39036e8f4efe0d1e5616d7;p=thirdparty%2Fbind9.git

Unify whitespace in bin/tests/system/run.sh

Replace tabs with spaces to make whitespace consistent across the entire
bin/tests/system/run.sh script.

(cherry picked from commit 0f0a006c7e30829ead5fbadb725a5be479fed1cb)
---

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
old mode 100755
new mode 100644
index 185bc55a8bf..5101e7f091e
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -17,8 +17,8 @@ SYSTEMTESTTOP="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 . $SYSTEMTESTTOP/conf.sh
 
 if [ "$(id -u)" -eq "0" ] && ! ${NAMED} -V | grep -q -F -- "enable-developer"; then
-	echofail "Refusing to run test as root. Build with --enable-developer to override." >&2
-	exit 1
+    echofail "Refusing to run test as root. Build with --enable-developer to override." >&2
+    exit 1
 fi
 
 export SYSTEMTESTTOP
@@ -31,21 +31,21 @@ stopservers=true
 baseport=5300
 
 if [ ${SYSTEMTEST_NO_CLEAN:-0} -eq 1 ]; then
-	clean=false
+    clean=false
 else
-	clean=true
+    clean=true
 fi
 
 while getopts "knp:r-:" flag; do
     case "$flag" in
-	-) case "${OPTARG}" in
+    -) case "${OPTARG}" in
                keep) stopservers=false ;;
                noclean) clean=false ;;
            esac
            ;;
-	k) stopservers=false ;;
-	n) clean=false ;;
-	p) baseport=$OPTARG ;;
+    k) stopservers=false ;;
+    n) clean=false ;;
+    p) baseport=$OPTARG ;;
     esac
 done
 shift `expr $OPTIND - 1`
@@ -198,10 +198,10 @@ fi
 if test -f $systest/clean.sh
 then
     if ! ( cd "${systest}" && $SHELL clean.sh "$@" ); then
-	echowarn "I:$systest:clean.sh script failed"
-	echofail "R:$systest:FAIL"
-	echoend  "E:$systest:$(date_with_args)"
-	exit 1
+    echowarn "I:$systest:clean.sh script failed"
+    echofail "R:$systest:FAIL"
+    echoend  "E:$systest:$(date_with_args)"
+    exit 1
     fi
 fi
 
@@ -209,10 +209,10 @@ fi
 if test -f $systest/setup.sh
 then
     if ! ( cd "${systest}" && $SHELL setup.sh "$@" ); then
-	echowarn "I:$systest:setup.sh script failed"
-	echofail "R:$systest:FAIL"
-	echoend  "E:$systest:$(date_with_args)"
-	exit 1
+    echowarn "I:$systest:setup.sh script failed"
+    echofail "R:$systest:FAIL"
+    echoend  "E:$systest:$(date_with_args)"
+    exit 1
     fi
 fi
 
@@ -230,16 +230,16 @@ fi
 if [ -n "$PYTEST" ]; then
     run=$((run+1))
     for test in $(cd "${systest}" && find . -name "tests*.py"); do
-	start_servers
-	rm -f "$systest/$test.status"
-	test_status=0
-	(cd "$systest" && "$PYTEST" -v "$test" "$@" || echo "$?" > "$test.status") | SYSTESTDIR="$systest" cat_d
-	if [ -f "$systest/$test.status" ]; then
-	    echo_i "FAILED"
-	    test_status=$(cat "$systest/$test.status")
-	fi
-	status=$((status+test_status))
-	stop_servers
+    start_servers
+    rm -f "$systest/$test.status"
+    test_status=0
+    (cd "$systest" && "$PYTEST" -v "$test" "$@" || echo "$?" > "$test.status") | SYSTESTDIR="$systest" cat_d
+    if [ -f "$systest/$test.status" ]; then
+        echo_i "FAILED"
+        test_status=$(cat "$systest/$test.status")
+    fi
+    status=$((status+test_status))
+    stop_servers
     done
 else
     echoinfo "I:$systest:pytest not installed, skipping python tests"
@@ -286,11 +286,11 @@ if [ -n "$core_dumps" ]; then
         coredump_backtrace=$(basename "${coredump}")-backtrace.txt
         echoinfo "D:$systest:full backtrace from $coredump saved in $coredump_backtrace"
         "${TOP}/libtool" --mode=execute gdb \
-        			  -batch \
-        			  -command=run.gdb \
-        			  -core="$coredump" \
-        			  -- \
-        			  "$binary" > "$coredump_backtrace" 2>&1
+                      -batch \
+                      -command=run.gdb \
+                      -core="$coredump" \
+                      -- \
+                      "$binary" > "$coredump_backtrace" 2>&1
         echoinfo "D:$systest:core dump $coredump archived as $coredump.gz"
         gzip -1 "${coredump}"
     done