From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 24 Sep 2024 10:03:23 +0000 (+0200)
Subject: Whitespace cleanup
X-Git-Tag: rec-5.2.0-alpha1~30^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd305a7cbb9fff7287ddd7a8278ff39ba27b9454;p=thirdparty%2Fpdns.git

Whitespace cleanup
---

diff --git a/regression-tests/backends/lmdb-slave b/regression-tests/backends/lmdb-slave
index 697ee7aa8f..62057691b0 100644
--- a/regression-tests/backends/lmdb-slave
+++ b/regression-tests/backends/lmdb-slave
@@ -1,82 +1,82 @@
-	context=${context}-presigned-lmdb
-	cat > pdns-lmdb2.conf << __EOF__
+        context=${context}-presigned-lmdb
+        cat > pdns-lmdb2.conf << __EOF__
 module-dir=./modules
 launch=lmdb
 lmdb-filename=./pdns2.lmdb
 __EOF__
 
-	rm -f pdns2.lmdb*
-	zones=0
-	for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | grep -v '^nztest.com$' | perl -e 'print reverse <STDIN>')
-	do
-		zones=$((zones+1))
-		if [ "$zone" = "example.com" ]; then
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
-		fi
-		if [ "$zone" = "test.com" ]; then
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone other-catalog.invalid
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone '{"consumer":{"coo":"catalog.invalid","unique":"42"}}'
-		fi
-		if [ "$zone" = "tsig.com" ]; then
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.2:$port
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone catalog.invalid
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone "{\"consumer\":{\"unique\":\"$($SAXFR 127.0.0.1 $port catalog.invalid | grep $zone | grep PTR | cut -d'.' -f1)\"}}"
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 import-tsig-key test $ALGORITHM $KEY
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 activate-tsig-key tsig.com test secondary
-		fi
-		if [ "$zone" = "stest.com" ]; then
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone other-catalog.invalid
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone "{\"consumer\":{\"coo\":\"catalog.invalid\",\"unique\":\"$($SAXFR 127.0.0.1 $port catalog.invalid | grep $zone | grep PTR | cut -d'.' -f1)\"}}"
-			if [[ $skipreasons != *nolua* ]]; then
-				$PDNSUTIL --config-dir=. --config-name=lmdb2 set-meta stest.com AXFR-SOURCE 127.0.0.2
-			fi
-		fi
-		if [ "$zone" = "wtest.com" ]; then
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone catalog.invalid
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone '{"consumer":{"unique":"42"}}'
-		fi
-		if [ "$zone" = "." ]; then
-			$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
-		fi
-	done
+        rm -f pdns2.lmdb*
+        zones=0
+        for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | grep -v '^nztest.com$' | perl -e 'print reverse <STDIN>')
+        do
+                zones=$((zones+1))
+                if [ "$zone" = "example.com" ]; then
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
+                fi
+                if [ "$zone" = "test.com" ]; then
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone other-catalog.invalid
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone '{"consumer":{"coo":"catalog.invalid","unique":"42"}}'
+                fi
+                if [ "$zone" = "tsig.com" ]; then
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.2:$port
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone catalog.invalid
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone "{\"consumer\":{\"unique\":\"$($SAXFR 127.0.0.1 $port catalog.invalid | grep $zone | grep PTR | cut -d'.' -f1)\"}}"
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 import-tsig-key test $ALGORITHM $KEY
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 activate-tsig-key tsig.com test secondary
+                fi
+                if [ "$zone" = "stest.com" ]; then
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone other-catalog.invalid
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone "{\"consumer\":{\"coo\":\"catalog.invalid\",\"unique\":\"$($SAXFR 127.0.0.1 $port catalog.invalid | grep $zone | grep PTR | cut -d'.' -f1)\"}}"
+                        if [[ $skipreasons != *nolua* ]]; then
+                                $PDNSUTIL --config-dir=. --config-name=lmdb2 set-meta stest.com AXFR-SOURCE 127.0.0.2
+                        fi
+                fi
+                if [ "$zone" = "wtest.com" ]; then
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog $zone catalog.invalid
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 set-options-json $zone '{"consumer":{"unique":"42"}}'
+                fi
+                if [ "$zone" = "." ]; then
+                        $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone $zone 127.0.0.1:$port
+                fi
+        done
 
-	# setup catalog zone
-	if [ $zones -ne 1 ] # detect root tests
-	then
-		zones=$((zones+1))
-		$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone catalog.invalid 127.0.0.1:$port
-		$PDNSUTIL --config-dir=. --config-name=lmdb2 set-kind catalog.invalid consumer
+        # setup catalog zone
+        if [ $zones -ne 1 ] # detect root tests
+        then
+                zones=$((zones+1))
+                $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone catalog.invalid 127.0.0.1:$port
+                $PDNSUTIL --config-dir=. --config-name=lmdb2 set-kind catalog.invalid consumer
 
-		$PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone remove.invalid 127.0.0.1:$port
-		$PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog remove.invalid catalog.invalid
-	fi
+                $PDNSUTIL --config-dir=. --config-name=lmdb2 create-secondary-zone remove.invalid 127.0.0.1:$port
+                $PDNSUTIL --config-dir=. --config-name=lmdb2 set-catalog remove.invalid catalog.invalid
+        fi
 
-	port=$((port+100))
+        port=$((port+100))
 
-	$RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
-		--config-name=lmdb2 --socket-dir=./ --no-shuffle \
-		--secondary --xfr-cycle-interval=15 --dname-processing --api --api-key=secret &
+        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
+                --config-name=lmdb2 --socket-dir=./ --no-shuffle \
+                --secondary --xfr-cycle-interval=15 --dname-processing --api --api-key=secret &
 
-	sleep 1
-	$PDNSCONTROL --config-name=lmdb2 --socket-dir=. --no-config retrieve catalog.invalid
+        sleep 1
+        $PDNSCONTROL --config-name=lmdb2 --socket-dir=. --no-config retrieve catalog.invalid
 
-	echo 'waiting for zones to be fetched'
-	loopcount=0
-	while [ $loopcount -lt 30 ]
-	do
-		sleep 5
-		present=$(curl -s -S -H 'X-API-Key: secret' http://127.0.0.1:8081/api/v1/servers/localhost/zones  | jq -r '.[] | .serial' | grep -c -v '^0$')
-		if [ $zones -eq $present ]
-		then
-			break
-		fi
-		let loopcount=loopcount+1
-	done
-	if [ $zones -ne $present ]
-	then
-		echo "AXFR FAILED" >> failed_tests
-		exit
-	fi
+        echo 'waiting for zones to be fetched'
+        loopcount=0
+        while [ $loopcount -lt 30 ]
+        do
+                sleep 5
+                present=$(curl -s -S -H 'X-API-Key: secret' http://127.0.0.1:8081/api/v1/servers/localhost/zones  | jq -r '.[] | .serial' | grep -c -v '^0$')
+                if [ $zones -eq $present ]
+                then
+                        break
+                fi
+                let loopcount=loopcount+1
+        done
+        if [ $zones -ne $present ]
+        then
+                echo "AXFR FAILED" >> failed_tests
+                exit
+        fi
diff --git a/regression-tests/runtests b/regression-tests/runtests
index d1ced13730..d02ea7eb3b 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -66,112 +66,112 @@ touch passed_tests failed_tests skipped_tests
 
 for a in $(find $testsdir -type d | grep -v ^.$ | grep -v .svn | grep -v ^confdir | LC_ALL=C sort)
 do
-	if [ ! -x $a/command ]
-	then
-		continue
-	fi
-	testname=$(basename $a)
-	export testname
-	echo  "$testname: "
-	if [ "${PDNS_DEBUG}" = "YES" ]; then
-		cat $a/description
-	fi
-
-	echo  "$testname: " >> test-results
-	cat $a/description >> test-results
-
-	SKIPIT=0
-	if [ -e $a/skip ]
-	then
-		SKIPIT=1
-		result="	Skipped test $a"
-	else
-		for reason in $skipreasons $context $backend
-		do
-			if [ -e $a/skip.$reason ]
-			then
-				SKIPIT=1
-				result="	Skipped test $a for reason $reason"
-				break
-			fi
-		done
-	fi
-
-	FAIL=0
-	for reason in $skipreasons $context $backend
-	do
-		if [ -e $a/fail.$reason ]
-		then
-			FAIL=1
-			break
-		fi
-	done
-
-	if [ "$spectest" != "" ] && [ "$spectest" != "$testname" ] && [ "$testname" != "00dnssec-grabkeys" ]
-	then
-		SKIPIT=1
-		result="	Skipped test $a because it's not the specified single test"
-	fi
-
-
-	if [ $SKIPIT = 1 ]
-	then
-		echo $testname >> skipped_tests
-		skipped=$[$skipped+1]
-	else
-		$a/command > $a/real_result
-		expected=$a/expected_result
-
-		diffopts="-u"
-		if [ -e $a/expected_result.i ]; then
-			expected=$a/expected_result.i
-			diffopts="${diffopts} -i"
-		fi
-
-		for extracontext in $extracontexts
-		do
-			[ -e "$a/expected_result.$extracontext" ] && expected=$a/expected_result.$extracontext
-		done
-		[ -n "$context" ] && [ -e "$a/expected_result.$context" ] && expected=$a/expected_result.$context
-		diff ${diffopts} $expected $a/real_result > $a/diff 2>&1
-		if [ -s $a/diff ]
-		then
-			if [ $FAIL = 0 ]
-			then
-				result="	Failed test $a"
-				echo $testname >> failed_tests
-				failed=$[$failed+1]
-				if [ "$FIX_TESTS" == "YES" ]
-				then
-					mv -f $a/real_result $expected
-					result="$result (fixed)"
-				fi
-			else
-				result="	Expected failure for reason $reason, test passed $a"
-				echo $testname >> passed_tests
-				passed=$[$passed+1]
-			fi
-		else
-			if [ $FAIL = 0 ]
-			then
-				result="	Passed test $a"
-				echo $testname >> passed_tests
-				passed=$[$passed+1]
-			else
-				result="	Unexpected pass for reason $reason, test failed $a"
-				echo $testname >> failed_tests
-				failed=$[$failed+1]
-			fi
-		fi
-	fi
-	echo "$result"
-	echo
-	echo "$result" >> test-results
-	echo >> test-results
+        if [ ! -x $a/command ]
+        then
+                continue
+        fi
+        testname=$(basename $a)
+        export testname
+        echo  "$testname: "
+        if [ "${PDNS_DEBUG}" = "YES" ]; then
+                cat $a/description
+        fi
+
+        echo  "$testname: " >> test-results
+        cat $a/description >> test-results
+
+        SKIPIT=0
+        if [ -e $a/skip ]
+        then
+                SKIPIT=1
+                result="	Skipped test $a"
+        else
+                for reason in $skipreasons $context $backend
+                do
+                        if [ -e $a/skip.$reason ]
+                        then
+                                SKIPIT=1
+                                result="	Skipped test $a for reason $reason"
+                                break
+                        fi
+                done
+        fi
+
+        FAIL=0
+        for reason in $skipreasons $context $backend
+        do
+                if [ -e $a/fail.$reason ]
+                then
+                        FAIL=1
+                        break
+                fi
+        done
+
+        if [ "$spectest" != "" ] && [ "$spectest" != "$testname" ] && [ "$testname" != "00dnssec-grabkeys" ]
+        then
+                SKIPIT=1
+                result="	Skipped test $a because it's not the specified single test"
+        fi
+
+
+        if [ $SKIPIT = 1 ]
+        then
+                echo $testname >> skipped_tests
+                skipped=$[$skipped+1]
+        else
+                $a/command > $a/real_result
+                expected=$a/expected_result
+
+                diffopts="-u"
+                if [ -e $a/expected_result.i ]; then
+                        expected=$a/expected_result.i
+                        diffopts="${diffopts} -i"
+                fi
+
+                for extracontext in $extracontexts
+                do
+                        [ -e "$a/expected_result.$extracontext" ] && expected=$a/expected_result.$extracontext
+                done
+                [ -n "$context" ] && [ -e "$a/expected_result.$context" ] && expected=$a/expected_result.$context
+                diff ${diffopts} $expected $a/real_result > $a/diff 2>&1
+                if [ -s $a/diff ]
+                then
+                        if [ $FAIL = 0 ]
+                        then
+                                result="	Failed test $a"
+                                echo $testname >> failed_tests
+                                failed=$[$failed+1]
+                                if [ "$FIX_TESTS" == "YES" ]
+                                then
+                                        mv -f $a/real_result $expected
+                                        result="$result (fixed)"
+                                fi
+                        else
+                                result="	Expected failure for reason $reason, test passed $a"
+                                echo $testname >> passed_tests
+                                passed=$[$passed+1]
+                        fi
+                else
+                        if [ $FAIL = 0 ]
+                        then
+                                result="	Passed test $a"
+                                echo $testname >> passed_tests
+                                passed=$[$passed+1]
+                        else
+                                result="	Unexpected pass for reason $reason, test failed $a"
+                                echo $testname >> failed_tests
+                                failed=$[$failed+1]
+                        fi
+                fi
+        fi
+        echo "$result"
+        echo
+        echo "$result" >> test-results
+        echo >> test-results
 done
 
 if [ $failed -gt 0 ]; then
-	echo -n "::error title=Regression-tests::Tests failed. "
+        echo -n "::error title=Regression-tests::Tests failed. "
 fi
 echo -n $passed out of $[$passed+$failed]
 echo -n " ("