From owner-svn-src-all@FreeBSD.ORG  Sun Nov 28 22:49:58 2010
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 9ACD6106566B;
	Sun, 28 Nov 2010 22:49:58 +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 88D708FC0A;
	Sun, 28 Nov 2010 22:49:58 +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 oASMnws4054892;
	Sun, 28 Nov 2010 22:49:58 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oASMnwIo054890;
	Sun, 28 Nov 2010 22:49:58 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201011282249.oASMnwIo054890@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 28 Nov 2010 22:49:58 +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: r216019 - 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: Sun, 28 Nov 2010 22:49:58 -0000

Author: jilles
Date: Sun Nov 28 22:49:58 2010
New Revision: 216019
URL: http://svn.freebsd.org/changeset/base/216019

Log:
  sh: Make the test for cd/pwd with long pathnames more useful:
  * Use $(getconf PATH_MAX /) to make sure we actually exercise the hard part
  * Delete our test area even if the test fails

Modified:
  head/tools/regression/bin/sh/builtins/cd2.0

Modified: head/tools/regression/bin/sh/builtins/cd2.0
==============================================================================
--- head/tools/regression/bin/sh/builtins/cd2.0	Sun Nov 28 22:07:08 2010	(r216018)
+++ head/tools/regression/bin/sh/builtins/cd2.0	Sun Nov 28 22:49:58 2010	(r216019)
@@ -1,15 +1,16 @@
 # $FreeBSD$
 set -e
 
+L=$(getconf PATH_MAX / 2>/dev/null) || L=4096
+[ "$L" -lt 100000 ] 2>/dev/null || L=4096
+L=$((L+100))
 T=$(mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXX)
+trap 'rm -rf ${T}' 0
 cd $T
 D=$T
-for i in 0 1 2 3 4 5 6 7 8 9; do
-	for j in 0 1 2 3 4 5 6 7 8 9; do
-		mkdir veryverylongdirectoryname
-		cd veryverylongdirectoryname
-		D=$D/veryverylongdirectoryname
-	done
+while [ ${#D} -lt $L ]; do
+	mkdir veryverylongdirectoryname
+	cd veryverylongdirectoryname
+	D=$D/veryverylongdirectoryname
 done
 [ $(pwd | wc -c) -eq $((${#D} + 1)) ] # +\n
-rm -rf ${T}