upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'michal/win32-system-test-fixes' into 'master'

Browse source 
Miscellaneous Windows system test fixes

See merge request isc-projects/bind9!1794
This commit is contained in:
Michał Kępień 2019-04-19 05:52:14 -04:00
commit e47754d7bf
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/tests/system/dnssec/tests.sh
View file

@ -1461,6 +1461,7 @@ test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
get_rsasha1_key_ids_from_sigs() {
tr -d '\r' < signer/example.db.signed | \
awk '
NF < 8 { next }
$(NF-5) != "RRSIG" { next }
@ -1470,7 +1471,8 @@ get_rsasha1_key_ids_from_sigs() {
getline;
print $3;
}
' signer/example.db.signed | sort -u
' | \
sort -u
}
echo_i "checking that we can sign a zone with out-of-zone records ($n)"

6
bin/tests/system/ifconfig.bat
View file

@ -10,8 +10,8 @@ rem ifconfig.bat
rem Set up interface aliases for bind9 system tests.
rem
rem IPv4: 10.53.0.{1..10} RFC 1918
rem 10.53.1.{0..2}
rem 10.53.2.{0..2}
rem 10.53.1.{1..2}
rem 10.53.2.{1..2}
rem IPv6: fd92:7065:b8e:ffff::{1..10} ULA
rem fd92:7065:b8e:99ff::{1..2}
rem fd92:7065:b8e:ff::{1..2}
@ -31,7 +31,7 @@ rem exit line
echo on
FOR %%I IN (1,2,3,4,5,6,7,8) DO (
FOR %%I IN (1,2,3,4,5,6,7,8,9,10) DO (
netsh interface ipv4 add address name=Loopback 10.53.0.%%I 255.255.255.0
netsh interface ipv6 add address interface=Loopback fd92:7065:b8e:ffff::%%I/64
)

4
bin/tests/system/ifconfig.sh
View file

@ -13,8 +13,8 @@
# Set up interface aliases for bind9 system tests.
#
# IPv4: 10.53.0.{1..10} RFC 1918
# 10.53.1.{0..2}
# 10.53.2.{0..2}
# 10.53.1.{1..2}
# 10.53.2.{1..2}
# IPv6: fd92:7065:b8e:ffff::{1..10} ULA
# fd92:7065:b8e:99ff::{1..2}
# fd92:7065:b8e:ff::{1..2}

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

@ -131,6 +131,8 @@ exit($errors);
sub server_lock_file {
my ( $server ) = @_;
return if (defined($ENV{'CYGWIN'}));
return $testdir . "/" . $server . "/named.lock" if ($server =~ /^ns/);
return if ($server =~ /^ans/);