Remove kasp Windows prereq check

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

(cherry picked from commit 87c05fa62f57763ac4e0aa20da7c1f4853134c80)

diff --git a/bin/tests/system/kasp/prereq.sh b/bin/tests/system/kasp/prereq.sh
deleted file mode 100644 (file)
index 7a20dcd..0000000
--- 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 739591c8f887a144ceedb85d976afa8d869df857..29711851887fc8d2aa2fe7d98144cbfe0b808578 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -697,7 +697,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