From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 7 Apr 2020 09:21:39 +0000 (+0200)
Subject: Remove kasp Windows prereq check
X-Git-Tag: v9.17.1~9^2~2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=87c05fa62f57763ac4e0aa20da7c1f4853134c80;p=thirdparty%2Fbind9.git

Remove kasp Windows prereq check

Now that the timing issue is fixed, we can enable the kasp test
again on Windows.
---

diff --git a/bin/tests/system/kasp/prereq.sh b/bin/tests/system/kasp/prereq.sh
deleted file mode 100644
index 7a20dcdb38f..00000000000
--- a/bin/tests/system/kasp/prereq.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
diff --git a/util/copyrights b/util/copyrights
index 36bd9197b7e..c0af48b41d7 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -699,7 +699,6 @@
 ./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