From: anton@openbsd.org <anton@openbsd.org>
Date: Wed, 25 Oct 2023 08:01:59 +0000 (+0000)
Subject: upstream: ssh conch interop tests requires a controlling terminal;
X-Git-Tag: V_9_6_P1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a611e4db4009447a0151f31a44e235ca32ed4429;p=thirdparty%2Fopenssh-portable.git

upstream: ssh conch interop tests requires a controlling terminal;

ok dtucker@

OpenBSD-Regress-ID: cbf2701bc347c2f19d907f113779c666f1ecae4a
---

diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index 37b363e81..f4202584e 100644
--- a/regress/conch-ciphers.sh
+++ b/regress/conch-ciphers.sh
@@ -1,11 +1,14 @@
-#	$OpenBSD: conch-ciphers.sh,v 1.5 2023/10/23 11:30:49 anton Exp $
+#	$OpenBSD: conch-ciphers.sh,v 1.6 2023/10/25 08:01:59 anton Exp $
 #	Placed in the Public Domain.
 
 tid="conch ciphers"
 
 if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
-	echo "conch interop tests not enabled"
-	exit 0
+	fatal "conch interop tests not enabled"
+fi
+
+if ! [ -t 0 ]; then
+	skip "conch interop tests requires a controlling terminal"
 fi
 
 start_sshd