svn commit: r268670 - user/pho/stress2/misc
Peter Holm
pho at FreeBSD.org
Tue Jul 15 13:29:38 UTC 2014
Author: pho
Date: Tue Jul 15 13:29:36 2014
New Revision: 268670
URL: http://svnweb.freebsd.org/changeset/base/268670
Log:
Fix trailing blanks. For tmpfs2.sh create mount point if not found.
Sponsored by: EMC / Isilon storage division
Modified:
user/pho/stress2/misc/tmpfs.sh
user/pho/stress2/misc/tmpfs10.sh
user/pho/stress2/misc/tmpfs2.sh
user/pho/stress2/misc/tmpfs3.sh
user/pho/stress2/misc/tmpfs4.sh
user/pho/stress2/misc/tmpfs6.sh
user/pho/stress2/misc/tmpfs7.sh
user/pho/stress2/misc/tmpfs9.sh
Modified: user/pho/stress2/misc/tmpfs.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -40,7 +40,7 @@ mount -t tmpfs tmpfs $mntpoint
export RUNDIR=$mntpoint/stressX
export runRUNTIME=10m # Run tests for 10 minutes
-(cd ..; ./run.sh marcus.cfg)
+(cd ..; ./run.sh marcus.cfg)
while mount | grep $mntpoint | grep -q tmpfs; do
umount $mntpoint || sleep 1
Modified: user/pho/stress2/misc/tmpfs10.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs10.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs10.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -30,13 +30,13 @@
# tmpfs(5) name lookup problem seen:
-# $ ./tmpfs10.sh
+# $ ./tmpfs10.sh
# tmpfs10: unlink(p01193.14729) at loop #2: No such file or directory
# unlink(p01193.14729) succeeded at call #2.
# tmpfs10: unlink(p01186.14409) at loop #2: No such file or directory
# unlink(p01186.14409) succeeded at call #2.
# FAIL
-# $
+# $
# Fixed in r253967.
Modified: user/pho/stress2/misc/tmpfs2.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs2.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs2.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -39,6 +39,7 @@ mounts=15 # Number of parallel scripts
if [ $# -eq 0 ]; then
# start the parallel tests
for i in `jot $mounts`; do
+ [ -d ${mntpoint}$i ] || mkdir -p ${mntpoint}$i
./$0 $i &
./$0 find &
done
Modified: user/pho/stress2/misc/tmpfs3.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs3.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs3.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -40,7 +40,7 @@ mount -t tmpfs tmpfs $mntpoint
export RUNDIR=$mntpoint/stressX
export runRUNTIME=10m # Run tests for 10 minutes
-(cd ..; ./run.sh vfs.cfg)
+(cd ..; ./run.sh vfs.cfg)
umount $mntpoint
mount | grep "$mntpoint" | grep -q tmpfs && umount -f $mntpoint
Modified: user/pho/stress2/misc/tmpfs4.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs4.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs4.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -38,8 +38,8 @@ mount | grep "$mntpoint" | grep -q tmpfs
mount -t tmpfs tmpfs $mntpoint
for i in `jot 100`; do
- mkdir -p /${mntpoint}/1/2
- cd /${mntpoint}/1/2
+ mkdir -p /${mntpoint}/1/2
+ cd /${mntpoint}/1/2
rm -rf /${mntpoint}/1
cd .. 2>&1 | grep -v "cd to"
done
Modified: user/pho/stress2/misc/tmpfs6.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs6.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs6.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -67,7 +67,7 @@ int pagesize;
#define FILESIZE (32 * 1024)
char wbuffer[FILESIZE];
-void
+void
test(void)
{
int fd;
@@ -100,7 +100,7 @@ test(void)
}
-int
+int
main(void)
{
int i;
Modified: user/pho/stress2/misc/tmpfs7.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs7.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs7.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -241,7 +241,7 @@ dd if=/dev/random of=$mntpoint/data bs=1
./server $mntpoint/data mysocket &
sleep 0.2
./client mysocket > data.$$
-cmp $mntpoint/data data.$$ ||
+cmp $mntpoint/data data.$$ ||
{ echo "FAIL Data mismatch"; ls -l $mntpoint/data data.$$; }
rm -f data.$$ server client mysocket
Modified: user/pho/stress2/misc/tmpfs9.sh
==============================================================================
--- user/pho/stress2/misc/tmpfs9.sh Tue Jul 15 11:03:51 2014 (r268669)
+++ user/pho/stress2/misc/tmpfs9.sh Tue Jul 15 13:29:36 2014 (r268670)
@@ -78,7 +78,7 @@ void test(void)
int i;
for (i = 0; i < N; i++) {
- if ((p = fork()) == 0)
+ if ((p = fork()) == 0)
if (execl(path, path, (char *)0) == -1)
err(1, "exec(%s)", path);
if (p > 0)
More information about the svn-src-user
mailing list