Call for testing: OpenSSH-5.7

[Damien Miller]

On Fri, 14 Jan 2011, Corinna Vinschen wrote:

> On Jan 14 15:08, Damien Miller wrote:
> > Hi,
> > 
> > Thanks everyone for their test reports. Last night Tim Rice and I fixed
> > some makefile and regress test problems that were causing some tests
> > not to run completely.
> > 
> > If you have the opportunity, we'd appreciate if you could rerun your tests
> > with the latest snapshot (20110114).
> 
> All tests still pass on Cygwin, except for sftp-glob.
> 
> However, I'm a bit tired having to change regress/Makefile all the time
> to run the tests.  Therefore, would you mind to apply the below patch?
> 
> It disables the sftp globbing tests testing backslashes in filenames.
> These can't work due to backslashes being directory separators on
> Windows(*).

I think we should propogate the host type into the regress environment,
since there are a couple of other platform quirks that we can use it for
(e.g. Darwin/OSX's failure of the agent-ptrace test).


Index: Makefile.in
===================================================================
RCS file: /var/cvs/openssh/Makefile.in,v
retrieving revision 1.318
diff -u -p -r1.318 Makefile.in
--- Makefile.in	14 Jan 2011 03:47:40 -0000	1.318
+++ Makefile.in	14 Jan 2011 21:23:04 -0000
@@ -30,6 +30,7 @@ RAND_HELPER=$(libexecdir)/ssh-rand-helpe
 PRIVSEP_PATH=@PRIVSEP_PATH@
 SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
 STRIP_OPT=@STRIP_OPT@
+HOSTTYPE=@HOSTTYPE@
 
 PATHS= -DSSHDIR=\"$(sysconfdir)\" \
 	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -416,6 +417,7 @@ tests interop-tests:	$(TARGETS)
 	TEST_SSH_CONCH="conch"; \
 	TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
 	TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
+	HOSTTYPE="@HOSTTYPE@" ; \
 	cd $(srcdir)/regress || exit $$?; \
 	$(MAKE) \
 		.OBJDIR="$${BUILDDIR}/regress" \
@@ -438,6 +440,7 @@ tests interop-tests:	$(TARGETS)
 		TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
 		TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
 		TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+		HOSTTYPE="$${HOSTTYPE}" \
 		EXEEXT="$(EXEEXT)" \
 		$@ && echo all tests passed
 
Index: configure.ac
===================================================================
RCS file: /var/cvs/openssh/configure.ac,v
retrieving revision 1.464
diff -u -p -r1.464 configure.ac
--- configure.ac	13 Jan 2011 06:35:46 -0000	1.464
+++ configure.ac	14 Jan 2011 21:23:04 -0000
@@ -371,6 +371,8 @@ SPC_MSG="no"
 SP_MSG="no"
 
 # Check for some target-specific stuff
+HOSTTYPE=$host
+AC_SUBST(HOSTTYPE)
 case "$host" in
 *-*-aix*)
 	# Some versions of VAC won't allow macro redefinitions at
Index: regress/sftp-glob.sh
===================================================================
RCS file: /var/cvs/openssh/regress/sftp-glob.sh,v
retrieving revision 1.5
diff -u -p -r1.5 sftp-glob.sh
--- regress/sftp-glob.sh	6 Oct 2009 23:43:57 -0000	1.5
+++ regress/sftp-glob.sh	14 Jan 2011 21:23:04 -0000
@@ -3,11 +3,25 @@
 
 tid="sftp glob"
 
+case "$HOSTTYPE" in
+*-*-cygwin*)
+	CYGWIN=1
+	;;
+*)
+	CYGWIN=
+	;;
+esac
+
 sftp_ls() {
 	target=$1
 	errtag=$2
 	expected=$3
 	unexpected=$4
+	skip=$5
+	if test "x$skip" != "x" ; then
+		verbose "$tid: $errtag skipped for $HOSTTYPE"
+		return
+	fi
 	verbose "$tid: $errtag"
 	printf "ls -l %s" "${target}" | \
 		${SFTP} -b - -D ${SFTPSERVER} 2>/dev/null | \
@@ -44,8 +58,8 @@ SPACE="${DIR}/g-q space"
 
 rm -rf ${BASE}
 mkdir -p ${DIR}
-touch "${DATA}" "${GLOB1}" "${GLOB2}" "${QUOTE}"
-touch "${QSLASH}" "${ESLASH}" "${SLASH}" "${SPACE}"
+touch "${DATA}" "${GLOB1}" "${GLOB2}" "${QUOTE}" "${SPACE}"
+test "x$CYGWIN" = "x" && touch "${QSLASH}" "${ESLASH}" "${SLASH}"
 
 #       target                   message                expected     unexpected
 sftp_ls "${DIR}/fil*"            "file glob"            "${DATA}"    ""
@@ -55,14 +69,15 @@ sftp_ls "${DIR}/g-wild\*"        "escape
 sftp_ls "${DIR}/g-quote\\\""     "escaped quote"        "g-quote\""  ""
 sftp_ls "\"${DIR}/g-quote\\\"\"" "quoted quote"         "g-quote\""  ""
 sftp_ls "'${DIR}/g-quote\"'"     "single-quoted quote"  "g-quote\""  ""
-sftp_ls "${DIR}/g-sl\\\\ash"     "escaped slash"        "g-sl\\ash"  ""
-sftp_ls "'${DIR}/g-sl\\\\ash'"   "quoted slash"         "g-sl\\ash"  ""
-sftp_ls "${DIR}/g-slash\\\\"     "escaped slash at EOL" "g-slash\\"  ""
-sftp_ls "'${DIR}/g-slash\\\\'"   "quoted slash at EOL"  "g-slash\\"  ""
-sftp_ls "${DIR}/g-qs\\\\\\\""    "escaped slash+quote"  "g-qs\\\""   ""
-sftp_ls "'${DIR}/g-qs\\\\\"'"    "quoted slash+quote"   "g-qs\\\""   ""
 sftp_ls "${DIR}/g-q\\ space"     "escaped space"        "g-q space"  ""
 sftp_ls "'${DIR}/g-q space'"     "quoted space"         "g-q space"  ""
+
+sftp_ls "${DIR}/g-sl\\\\ash"     "escaped slash"        "g-sl\\ash"  "" $CYGWIN
+sftp_ls "'${DIR}/g-sl\\\\ash'"   "quoted slash"         "g-sl\\ash"  "" $CYGWIN
+sftp_ls "${DIR}/g-slash\\\\"     "escaped slash at EOL" "g-slash\\"  "" $CYGWIN
+sftp_ls "'${DIR}/g-slash\\\\'"   "quoted slash at EOL"  "g-slash\\"  "" $CYGWIN
+sftp_ls "${DIR}/g-qs\\\\\\\""    "escaped slash+quote"  "g-qs\\\""   "" $CYGWIN
+sftp_ls "'${DIR}/g-qs\\\\\"'"    "quoted slash+quote"   "g-qs\\\""   "" $CYGWIN
 
 rm -rf ${BASE}