svn commit: r280002 - stable/10/tools/regression/usr.bin/env

[Jilles Tjoelker]

Author: jilles
Date: Sat Mar 14 20:40:04 2015
New Revision: 280002
URL: https://svnweb.freebsd.org/changeset/base/280002

Log:
  MFC r279722: env: Fix testsuite for additional variables set by sh.

Modified:
  stable/10/tools/regression/usr.bin/env/regress-env.rgdata
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tools/regression/usr.bin/env/regress-env.rgdata
==============================================================================
--- stable/10/tools/regression/usr.bin/env/regress-env.rgdata	Sat Mar 14 19:22:15 2015	(r280001)
+++ stable/10/tools/regression/usr.bin/env/regress-env.rgdata	Sat Mar 14 20:40:04 2015	(r280002)
@@ -235,9 +235,9 @@ gblenv=OUTSIDEVAR=OutsideValue
    script:/bin/echo "=== set ==="
    script:# drop some environment variables that 'sh' itself sets, and
    script:# then have 'set' print out all remaining environment variables.
-   script:# (can't unset OPTIND, so we use grep to get rid of that)
-   script:unset -v IFS PS1 PS2 PPID
-   script:set | grep -v '^OPTIND=' | sort
+   script:# (can't unset OPTIND/PWD, so we use grep to get rid of those)
+   script:unset -v IFS PS1 PS2 PS4 PPID
+   script:set | grep -Ev '^(OPTIND|PWD)=' | sort
    stdout:=== set ===
    stdout:PATH=/bin:/usr/bin:/Not
    stdout:TESTVAR=SbValue