Commit 2dee0589 authored by Michał Kępień's avatar Michał Kępień

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

[v9_11] Miscellaneous Windows system test fixes

See merge request !1835
parents 0aec9552 f78f6439
Pipeline #13663 passed with stages
in 53 seconds
......@@ -1402,6 +1402,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
get_rsasha1_key_ids_from_sigs() {
tr -d '\r' < signer/example.db.signed | \
awk '
NF < 8 { next }
$(NF-5) != "RRSIG" { next }
......@@ -1411,7 +1412,8 @@ get_rsasha1_key_ids_from_sigs() {
getline;
print $3;
}
' signer/example.db.signed | sort -u
' | \
sort -u
}
echo_i "checking that a key using an unsupported algorithm cannot be generated ($n)"
......
......@@ -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
)
......
......@@ -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}
......
......@@ -141,6 +141,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/);
return $testdir . "/" . $server . "/lwresd.lock" if ($server =~ /^lwresd/);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment