From owner-svn-src-all@FreeBSD.ORG  Sat Mar  7 13:54:45 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 92DB1189;
 Sat,  7 Mar 2015 13:54:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7DA09AF;
 Sat,  7 Mar 2015 13:54:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t27Dsj9d058888;
 Sat, 7 Mar 2015 13:54:45 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t27DsjLq058887;
 Sat, 7 Mar 2015 13:54:45 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201503071354.t27DsjLq058887@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 7 Mar 2015 13:54:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279722 - head/tools/regression/usr.bin/env
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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, 07 Mar 2015 13:54:45 -0000

Author: jilles
Date: Sat Mar  7 13:54:44 2015
New Revision: 279722
URL: https://svnweb.freebsd.org/changeset/base/279722

Log:
  env: Fix testsuite for additional variables set by sh.
  
  MFC after:	1 week

Modified:
  head/tools/regression/usr.bin/env/regress-env.rgdata

Modified: head/tools/regression/usr.bin/env/regress-env.rgdata
==============================================================================
--- head/tools/regression/usr.bin/env/regress-env.rgdata	Sat Mar  7 04:38:25 2015	(r279721)
+++ head/tools/regression/usr.bin/env/regress-env.rgdata	Sat Mar  7 13:54:44 2015	(r279722)
@@ -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