upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-02 05:20:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove remnants of Windows support in system test

Browse source 
The "uname -o" command is harmful on OpenBSD because this platform does
not know about the "-o" option. It is a permanent failure since system
tests are started with "set -e".

(cherry picked from commit ad3efede4d)
This commit is contained in:
Michal Nowak 2023-07-17 18:33:50 +02:00
parent 5cd6d2e70b
commit add15bd083
No known key found for this signature in database
3 changed files with 11 additions and 30 deletions
Show stats 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
[ "$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."
exit 1
@ -211,10 +207,6 @@ down() {
[ "$a" ] && ifconfig lo0 -alias $a
[ "$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."
exit 1

25
bin/tests/system/metadata/tests.sh
View file

@ -139,21 +139,16 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
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
# settime should print a warning about changing the permissions
chmod 644 $(cat oldstyle.key).private
$SETTIME -P none $(cat oldstyle.key) > settime1.test$n 2>&1 || ret=1
grep "warning: Permissions on the file.*have changed" settime1.test$n > /dev/null 2>&1 || ret=1
$SETTIME -P none $(cat oldstyle.key) > settime2.test$n 2>&1 || ret=1
grep "warning: Permissions on the file.*have changed" settime2.test$n > /dev/null 2>&1 && ret=1
n=$((n + 1))
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
fi
ret=0
# settime should print a warning about changing the permissions
chmod 644 $(cat oldstyle.key).private
$SETTIME -P none $(cat oldstyle.key) > settime1.test$n 2>&1 || ret=1
grep "warning: Permissions on the file.*have changed" settime1.test$n > /dev/null 2>&1 || ret=1
$SETTIME -P none $(cat oldstyle.key) > settime2.test$n 2>&1 || ret=1
grep "warning: Permissions on the file.*have changed" settime2.test$n > /dev/null 2>&1 && ret=1
n=$((n + 1))
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
echo_i "checking warning about delete date < inactive date with dnssec-settime ($n)"
ret=0

8
bin/tests/system/stop.pl
View file

@ -214,13 +214,7 @@ sub send_signal {
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;
}