From owner-svn-src-all@FreeBSD.ORG  Sat Feb  5 23:00:25 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F35E1065672;
	Sat,  5 Feb 2011 23:00:25 +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 037F88FC18;
	Sat,  5 Feb 2011 23:00:25 +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 p15N0OP9044371;
	Sat, 5 Feb 2011 23:00:24 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15N0ONn044367;
	Sat, 5 Feb 2011 23:00:24 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201102052300.p15N0ONn044367@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 5 Feb 2011 23:00:24 +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: r218356 - head/tools/regression/bin/sh/builtins
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Feb 2011 23:00:25 -0000

Author: jilles
Date: Sat Feb  5 23:00:24 2011
New Revision: 218356
URL: http://svn.freebsd.org/changeset/base/218356

Log:
  sh: Weaken some tests to allow /rescue/sh to pass everything.
  
  /rescue/sh has a different _PATH_STDPATH which affects command -p.

Modified:
  head/tools/regression/bin/sh/builtins/command6.0
  head/tools/regression/bin/sh/builtins/command6.0.stdout
  head/tools/regression/bin/sh/builtins/command7.0

Modified: head/tools/regression/bin/sh/builtins/command6.0
==============================================================================
--- head/tools/regression/bin/sh/builtins/command6.0	Sat Feb  5 22:57:14 2011	(r218355)
+++ head/tools/regression/bin/sh/builtins/command6.0	Sat Feb  5 23:00:24 2011	(r218356)
@@ -1,6 +1,12 @@
 # $FreeBSD$
 PATH=/var/empty
-command -pV ls
+case $(command -pV ls) in
+*/var/empty/ls*)
+	echo "Failed: \$(command -pV ls) should not match */var/empty/ls*" ;;
+"ls is"*" "/*/ls) ;;
+*)
+	echo "Failed: \$(command -pV ls) match \"ls is\"*\" \"/*/ls" ;;
+esac
 command -pV true
 command -pV /bin/ls
 

Modified: head/tools/regression/bin/sh/builtins/command6.0.stdout
==============================================================================
--- head/tools/regression/bin/sh/builtins/command6.0.stdout	Sat Feb  5 22:57:14 2011	(r218355)
+++ head/tools/regression/bin/sh/builtins/command6.0.stdout	Sat Feb  5 23:00:24 2011	(r218356)
@@ -1,4 +1,3 @@
-ls is /bin/ls
 true is a shell builtin
 /bin/ls is /bin/ls
 fun is a shell function

Modified: head/tools/regression/bin/sh/builtins/command7.0
==============================================================================
--- head/tools/regression/bin/sh/builtins/command7.0	Sat Feb  5 22:57:14 2011	(r218355)
+++ head/tools/regression/bin/sh/builtins/command7.0	Sat Feb  5 23:00:24 2011	(r218356)
@@ -24,6 +24,11 @@ check '"$(command -pv ld-elf.so.1; :)" =
 PATH=/libexec
 
 check '"$(command -v ls)" = ""'
-check '"$(command -pv ls)" = "/bin/ls"'
+case $(command -pv ls) in
+/*/ls) ;;
+*)
+	echo "Failed: \$(command -pv ls) match /*/ls"
+	: $((failures += 1)) ;;
+esac
 
 exit $((failures > 0))