mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mnowak/remove-windows-support-remnants' into 'main'

Browse Source 
Remove remnants of Windows support in system test

See merge request isc-projects/bind9!8105
This commit is contained in:
Michal Nowak
2023-07-18 14:40:24 +00:00
parent 086d78a4f1 ad3efede4d
commit b14bb7be97
3 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/tests/system/ifconfig.sh.in
View File

@@ -123,10 +123,6 @@ up() {
[ "$a" ] && ifconfig lo0 alias $a [ "$a" ] && ifconfig lo0 alias $a
[ "$aaaa" ] && ifconfig lo0 inet6 $aaaa alias [ "$aaaa" ] && ifconfig lo0 inet6 $aaaa alias
;; ;;
*-cygwin*)
echo "Please run ifconfig.bat as Administrator."
exit 1
;;
*) *)
echo "Don't know how to set up interface. Giving up." echo "Don't know how to set up interface. Giving up."
exit 1 exit 1
@@ -211,10 +207,6 @@ down() {
[ "$a" ] && ifconfig lo0 -alias $a [ "$a" ] && ifconfig lo0 -alias $a
[ "$aaaa" ] && ifconfig lo0 inet6 $aaaa delete [ "$aaaa" ] && ifconfig lo0 inet6 $aaaa delete
;; ;;
*-cygwin*)
echo "Please run ifconfig.bat as Administrator."
exit 1
;;
*) *)
echo "Don't know how to destroy interface. Giving up." echo "Don't know how to destroy interface. Giving up."
exit 1 exit 1

5
bin/tests/system/metadata/tests.sh
View File

@@ -139,10 +139,6 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
echo_i "checking warning about permissions change on key with dnssec-settime ($n)" echo_i "checking warning about permissions change on key with dnssec-settime ($n)"
uname=$(uname -o 2> /dev/null)
if [ Cygwin = "$uname" ]; then
echo_i "Cygwin detected, skipping"
else
ret=0 ret=0
# settime should print a warning about changing the permissions # settime should print a warning about changing the permissions
chmod 644 $(cat oldstyle.key).private chmod 644 $(cat oldstyle.key).private
@@ -153,7 +149,6 @@ else
n=$((n + 1)) n=$((n + 1))
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
fi
echo_i "checking warning about delete date < inactive date with dnssec-settime ($n)" echo_i "checking warning about delete date < inactive date with dnssec-settime ($n)"
ret=0 ret=0

6
bin/tests/system/stop.pl
View File

@@ -214,13 +214,7 @@ sub send_signal {
my $result = 0; my $result = 0;
if (!$ans && ($^O eq 'cygwin' || $^O eq 'msys')) {
my $killout = `/bin/kill -f -$signal $pid 2>&1`;
chomp($killout);
$result = 1 if ($killout eq '');
} else {
$result = kill $signal, $pid; $result = kill $signal, $pid;
}
return $result; return $result;
} }