From ad3efede4d89a1b84461077cb95d3eb9ba63c78b Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 17 Jul 2023 18:33:50 +0200
Subject: [PATCH] Remove remnants of Windows support in system test

The "uname -o" command is harmful on OpenBSD because this platform does
not know about the "-o" option. It is a permanent failure since system
tests are started with "set -e".
---
 bin/tests/system/ifconfig.sh.in    |  8 --------
 bin/tests/system/metadata/tests.sh | 25 ++++++++++---------------
 bin/tests/system/stop.pl           |  8 +-------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/bin/tests/system/ifconfig.sh.in b/bin/tests/system/ifconfig.sh.in
index 298bd3f041..ed84fd19d7 100755
--- a/bin/tests/system/ifconfig.sh.in
+++ b/bin/tests/system/ifconfig.sh.in
@@ -123,10 +123,6 @@ up() {
 		[ "$a" ] && ifconfig lo0 alias $a
 		[ "$aaaa" ] && ifconfig lo0 inet6 $aaaa alias
 		;;
-	    *-cygwin*)
-		echo "Please run ifconfig.bat as Administrator."
-		exit 1
-		;;
 	    *)
 		echo "Don't know how to set up interface.  Giving up."
 		exit 1
@@ -211,10 +207,6 @@ down() {
 		[ "$a" ] && ifconfig lo0 -alias $a
 		[ "$aaaa" ] && ifconfig lo0 inet6 $aaaa delete
 		;;
-	    *-cygwin*)
-		echo "Please run ifconfig.bat as Administrator."
-		exit 1
-		;;
 	    *)
 		echo "Don't know how to destroy interface.  Giving up."
 		exit 1
diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index 38141b27a1..3a91bb783e 100644
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -139,21 +139,16 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking warning about permissions change on key with dnssec-settime ($n)"
-uname=$(uname -o 2> /dev/null)
-if [ Cygwin = "$uname"  ]; then
-	echo_i "Cygwin detected, skipping"
-else
-	ret=0
-	# settime should print a warning about changing the permissions
-	chmod 644 $(cat oldstyle.key).private
-	$SETTIME -P none $(cat oldstyle.key) > settime1.test$n 2>&1 || ret=1
-	grep "warning: Permissions on the file.*have changed" settime1.test$n > /dev/null 2>&1 || ret=1
-	$SETTIME -P none $(cat oldstyle.key) > settime2.test$n 2>&1 || ret=1
-	grep "warning: Permissions on the file.*have changed" settime2.test$n > /dev/null 2>&1 && ret=1
-	n=$((n + 1))
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=$((status + ret))
-fi
+ret=0
+# settime should print a warning about changing the permissions
+chmod 644 $(cat oldstyle.key).private
+$SETTIME -P none $(cat oldstyle.key) > settime1.test$n 2>&1 || ret=1
+grep "warning: Permissions on the file.*have changed" settime1.test$n > /dev/null 2>&1 || ret=1
+$SETTIME -P none $(cat oldstyle.key) > settime2.test$n 2>&1 || ret=1
+grep "warning: Permissions on the file.*have changed" settime2.test$n > /dev/null 2>&1 && ret=1
+n=$((n + 1))
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status + ret))
 
 echo_i "checking warning about delete date < inactive date with dnssec-settime ($n)"
 ret=0
diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index cb35af3afd..8fa1d4236e 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -214,13 +214,7 @@ sub send_signal {
 
 	my $result = 0;
 
-	if (!$ans && ($^O eq 'cygwin' || $^O eq 'msys')) {
-		my $killout = `/bin/kill -f -$signal $pid 2>&1`;
-		chomp($killout);
-		$result = 1 if ($killout eq '');
-	} else {
-		$result = kill $signal, $pid;
-	}
+	$result = kill $signal, $pid;
 	return $result;
 }