Merge branch 'matthijs-disable-mscv-kasp-system-test' into 'master'

Disable kasp test on Windows

See merge request isc-projects/bind9!3206

bin/tests/system/kasp/prereq.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+if [ "$CYGWIN" ]; then
+        echo_i "KASP test disabled on Windows for now due to timing issues"
+        exit 255
+fi
+exit 0

bin/tests/system/kasp/tests.sh

@@ -1853,7 +1853,6 @@ check_apex
 check_subdomain
 dnssec_verify
 
-set_keydir "ns4"
 set_zone "example.net"
 set_server "ns4" "10.53.0.4"
 TSIG="hmac-sha1:keyforview1:$VIEW1"

util/copyrights

@@ -698,6 +698,7 @@
 ./bin/tests/system/kasp/ns4/setup.sh		SH	2019,2020
 ./bin/tests/system/kasp/ns5/setup.sh		SH	2019,2020
 ./bin/tests/system/kasp/ns6/setup.sh		SH	2020
+./bin/tests/system/kasp/prereq.sh		SH	2020
 ./bin/tests/system/kasp/setup.sh		SH	2019,2020
 ./bin/tests/system/kasp/tests.sh		SH	2019,2020
 ./bin/tests/system/keepalive/clean.sh		SH	2017,2018,2019,2020