From owner-svn-src-head@FreeBSD.ORG  Sun Dec 12 21:18:16 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 CD1571065670;
	Sun, 12 Dec 2010 21:18:16 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB5CC8FC0A;
	Sun, 12 Dec 2010 21:18:16 +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 oBCLIGrZ060066;
	Sun, 12 Dec 2010 21:18:16 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBCLIGYd060063;
	Sun, 12 Dec 2010 21:18:16 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201012122118.oBCLIGYd060063@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 12 Dec 2010 21:18:16 +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: r216398 - in head/tools/regression/bin/sh: errors
	execution
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: Sun, 12 Dec 2010 21:18:16 -0000

Author: jilles
Date: Sun Dec 12 21:18:16 2010
New Revision: 216398
URL: http://svn.freebsd.org/changeset/base/216398

Log:
  sh: Fix some tests that used sh instead of ${SH}
  so they tested the wrong sh.
  
  This was caused because these tests were committed after the sh -> ${SH}
  change but were created before.

Modified:
  head/tools/regression/bin/sh/errors/bad-keyword1.0
  head/tools/regression/bin/sh/execution/func3.0

Modified: head/tools/regression/bin/sh/errors/bad-keyword1.0
==============================================================================
--- head/tools/regression/bin/sh/errors/bad-keyword1.0	Sun Dec 12 20:50:44 2010	(r216397)
+++ head/tools/regression/bin/sh/errors/bad-keyword1.0	Sun Dec 12 21:18:16 2010	(r216398)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-echo ':; fi' | sh -n 2>/dev/null && exit 1
+echo ':; fi' | ${SH} -n 2>/dev/null && exit 1
 exit 0

Modified: head/tools/regression/bin/sh/execution/func3.0
==============================================================================
--- head/tools/regression/bin/sh/execution/func3.0	Sun Dec 12 20:50:44 2010	(r216397)
+++ head/tools/regression/bin/sh/execution/func3.0	Sun Dec 12 21:18:16 2010	(r216398)
@@ -3,5 +3,5 @@
 # This may fail when parsing or when defining the function, or the definition
 # may silently do nothing. In no event may the function be executed.
 
-sh -c 'unset() { echo overriding function executed, bad; }; v=1; unset v; exit "${v-0}"' 2>/dev/null
+${SH} -c 'unset() { echo overriding function executed, bad; }; v=1; unset v; exit "${v-0}"' 2>/dev/null
 :