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)) _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
