From owner-svn-src-head@FreeBSD.ORG  Mon Dec 27 15:57:42 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0A7911065672;
	Mon, 27 Dec 2010 15:57:42 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ED4CA8FC17;
	Mon, 27 Dec 2010 15:57:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBRFvfbL029844;
	Mon, 27 Dec 2010 15:57:41 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBRFvfP9029841;
	Mon, 27 Dec 2010 15:57:41 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201012271557.oBRFvfP9029841@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 27 Dec 2010 15:57:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216738 - head/tools/regression/bin/sh/expansion
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Dec 2010 15:57:42 -0000

Author: emaste
Date: Mon Dec 27 15:57:41 2010
New Revision: 216738
URL: http://svn.freebsd.org/changeset/base/216738

Log:
  Restore two commented-out tests from plus-minus1.0 to a new file.
  
  These two cases pass on -CURRENT but fail on stable/8.
  
  Reviewed by:	jilles

Added:
  head/tools/regression/bin/sh/expansion/plus-minus7.0   (contents, props changed)
Modified:
  head/tools/regression/bin/sh/expansion/plus-minus1.0

Modified: head/tools/regression/bin/sh/expansion/plus-minus1.0
==============================================================================
--- head/tools/regression/bin/sh/expansion/plus-minus1.0	Mon Dec 27 15:05:15 2010	(r216737)
+++ head/tools/regression/bin/sh/expansion/plus-minus1.0	Mon Dec 27 15:57:41 2010	(r216738)
@@ -43,9 +43,6 @@ testcase 'set -- ${e:+$w"$e"}'			'0|'
 testcase 'set -- ${w:+"$w"}'			'1|a b c'
 testcase 'set -- ${w:+$w"$w"}'			'3|a|b|ca b c'
 
-# These two are known broken in FreeBSD /bin/sh
-#testcase 'set -- ${s+a b}'			'2|a|b'
-#testcase 'set -- ${e:-a b}'			'2|a|b'
 testcase 'set -- "${s+a b}"'			'1|a b'
 testcase 'set -- "${e:-a b}"'			'1|a b'
 testcase 'set -- ${e:-\}}'			'1|}'

Added: head/tools/regression/bin/sh/expansion/plus-minus7.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/expansion/plus-minus7.0	Mon Dec 27 15:57:41 2010	(r216738)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+e= s='foo'
+failures=''
+ok=''
+
+testcase() {
+	code="$1"
+	expected="$2"
+	oIFS="$IFS"
+	eval "$code"
+	IFS='|'
+	result="$#|$*"
+	IFS="$oIFS"
+	if [ "x$result" = "x$expected" ]; then
+		ok=x$ok
+	else
+		failures=x$failures
+		echo "For $code, expected $expected actual $result"
+	fi
+}
+
+testcase 'set -- ${s+a b}'			'2|a|b'
+testcase 'set -- ${e:-a b}'			'2|a|b'
+
+test "x$failures" = x