From owner-svn-src-user@FreeBSD.ORG  Sun Nov 24 09:24:54 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7CE8DAED;
 Sun, 24 Nov 2013 09:24:54 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 52DEE2840;
 Sun, 24 Nov 2013 09:24:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9Os1T093220;
 Sun, 24 Nov 2013 09:24:54 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9OsHi093219;
 Sun, 24 Nov 2013 09:24:54 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201311240924.rAO9OsHi093219@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 24 Nov 2013 09:24:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258513 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Nov 2013 09:24:54 -0000

Author: pho
Date: Sun Nov 24 09:24:53 2013
New Revision: 258513
URL: http://svnweb.freebsd.org/changeset/base/258513

Log:
  No need to specify full path in test program, fixed cleanup.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/rename.sh

Modified: user/pho/stress2/misc/rename.sh
==============================================================================
--- user/pho/stress2/misc/rename.sh	Sun Nov 24 09:20:24 2013	(r258512)
+++ user/pho/stress2/misc/rename.sh	Sun Nov 24 09:24:53 2013	(r258513)
@@ -40,7 +40,6 @@ cd /tmp
 sed '1,/^EOF/d' < $here/$0 > rename.c
 cc -o rename -Wall rename.c
 rm -f rename.c
-cd $here
 
 rm -rf /tmp/rename.dir.*
 for i in `jot 10`; do
@@ -51,7 +50,7 @@ for i in `jot 10`; do
 		wait
 	done
 done
-rm -rf /tmp/rename.dir.*
+rm -rf /tmp/rename.dir.* /tmp/rename
 exit 0
 EOF
 #include <err.h>
@@ -65,6 +64,8 @@ EOF
 #include <sys/wait.h>
 #include <unistd.h>
 
+#define N 30000
+
 static char dir1[128];
 static char dir2[128];
 
@@ -75,8 +76,8 @@ main(int argc, char **argv)
 	struct stat sb;
 	pid_t p;
 
-	sprintf(dir1, "/tmp/rename.dir.%d", getpid());
-	sprintf(dir2, "/tmp/rename.dir.2.%d", getpid());
+	sprintf(dir1, "rename.dir.%d", getpid());
+	sprintf(dir2, "rename.dir.2.%d", getpid());
 	if (mkdir(dir1, 0700) == -1)
 		err(1, "mkdir(%s)", dir1);
 
@@ -87,7 +88,7 @@ main(int argc, char **argv)
 	if (p == 0) {
 		if (chdir("..") == -1)
 			err(1, "chdir(%s)", "..");
-		for (i = 0; i < 100000; i++) {
+		for (i = 0; i < N; i++) {
 			if (rename(dir1, dir2) == -1) {
 				warn("rename(%s, %s)", dir1, dir2);
 				stat(dir1, &sb);
@@ -105,15 +106,17 @@ main(int argc, char **argv)
 					errx(1, "stat(%s) succeeded!", dir2);
 			}
 		}
-		exit(0);
+		_exit(0);
 	} else {
-		for (i = 0; i < 100000; i++) {
+		for (i = 0; i < N; i++) {
 			if (stat("..", &sb) == -1)
 				err(1, "stat(..)");
 		}
 	}
 	if (waitpid(p, &status, 0) == -1)
 		err(1, "waitpid()");
+	if (chdir("..") == -1)
+		err(1, "chdir(%s)", "..");
 	if (rmdir(dir1) == -1)
 		err(1, "rmdir(%s)", dir1);