From owner-svn-src-head@freebsd.org  Mon Jul 13 01:32:37 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B1EDB3551F2;
 Mon, 13 Jul 2020 01:32:37 +0000 (UTC)
 (envelope-from yuripv@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B4mNj4Ddvz4H2n;
 Mon, 13 Jul 2020 01:32:37 +0000 (UTC)
 (envelope-from yuripv@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74FDADC59;
 Mon, 13 Jul 2020 01:32:37 +0000 (UTC)
 (envelope-from yuripv@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06D1WbIm004854;
 Mon, 13 Jul 2020 01:32:37 GMT (envelope-from yuripv@FreeBSD.org)
Received: (from yuripv@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06D1WbD3004853;
 Mon, 13 Jul 2020 01:32:37 GMT (envelope-from yuripv@FreeBSD.org)
Message-Id: <202007130132.06D1WbD3004853@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuripv set sender to
 yuripv@FreeBSD.org using -f
From: Yuri Pankov <yuripv@FreeBSD.org>
Date: Mon, 13 Jul 2020 01:32:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r363138 - head/usr.bin/sed/tests
X-SVN-Group: head
X-SVN-Commit-Author: yuripv
X-SVN-Commit-Paths: head/usr.bin/sed/tests
X-SVN-Commit-Revision: 363138
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2020 01:32:37 -0000

Author: yuripv
Date: Mon Jul 13 01:32:37 2020
New Revision: 363138
URL: https://svnweb.freebsd.org/changeset/base/363138

Log:
  sed/multi_test: print comment for current test, not next one
  
  This is visible when e.g. 8.20 is failing:
  
  not ok 96 8.20 # \ in y command
  
  8.20's comment should be '[ as an s delimiter and its escapes'.

Modified:
  head/usr.bin/sed/tests/multi_test.sh

Modified: head/usr.bin/sed/tests/multi_test.sh
==============================================================================
--- head/usr.bin/sed/tests/multi_test.sh	Mon Jul 13 01:28:45 2020	(r363137)
+++ head/usr.bin/sed/tests/multi_test.sh	Mon Jul 13 01:32:37 2020	(r363138)
@@ -92,9 +92,9 @@ result()
 		cp current.out $REGRESS/${TESTNAME}
 	fi
 	if diff -c $REGRESS/${TESTNAME} current.out ; then
-		echo "ok $MARK $TESTNAME # $TODO$COMMENT"
+		echo "ok $MARK $TESTNAME # $TODO$OCOMMENT"
 	else
-		echo "not ok $MARK $TESTNAME # $TODO$COMMENT"
+		echo "not ok $MARK $TESTNAME # $TODO$OCOMMENT"
 	fi 1>&4 2>&5
 }
 
@@ -102,6 +102,7 @@ result()
 mark()
 {
 	[ $MARK -gt 0 ] && result
+	OCOMMENT=$COMMENT
 	MARK=`expr $MARK + 1`
 	TESTNAME=$1
 	exec 1>&4 2>&5