svn commit: r272087 - in head/contrib/pjdfstest/tests: chflags chmod chown ftruncate link mkdir mkfifo open rename rmdir symlink truncate unlink
Garrett Cooper
ngie at FreeBSD.org
Wed Sep 24 22:51:23 UTC 2014
Author: ngie
Date: Wed Sep 24 22:51:16 2014
New Revision: 272087
URL: http://svnweb.freebsd.org/changeset/base/272087
Log:
Increase the memory disk size in the following testcases to avoid mount
failures, which would cause cascade failures in the rest of the test
run:
link/15.t, open/19.t, mkdir/11.t, mkfifo/11.t, symlink/11.t
Fail quickly in all of the testcases if mdconfig, mount, umount, etc
fails to avoid issues similar to this in the future
Submitted by: Casey Peel <cpeel at isilon.com>
MFC after: 2 weeks
X-MFC with: r272057
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/pjdfstest/tests/chflags/12.t
head/contrib/pjdfstest/tests/chmod/09.t
head/contrib/pjdfstest/tests/chown/09.t
head/contrib/pjdfstest/tests/ftruncate/10.t
head/contrib/pjdfstest/tests/link/05.t
head/contrib/pjdfstest/tests/link/14.t
head/contrib/pjdfstest/tests/link/15.t
head/contrib/pjdfstest/tests/link/16.t
head/contrib/pjdfstest/tests/mkdir/09.t
head/contrib/pjdfstest/tests/mkdir/11.t
head/contrib/pjdfstest/tests/mkfifo/08.t
head/contrib/pjdfstest/tests/mkfifo/11.t
head/contrib/pjdfstest/tests/open/14.t
head/contrib/pjdfstest/tests/open/15.t
head/contrib/pjdfstest/tests/open/19.t
head/contrib/pjdfstest/tests/rename/15.t
head/contrib/pjdfstest/tests/rename/16.t
head/contrib/pjdfstest/tests/rmdir/13.t
head/contrib/pjdfstest/tests/rmdir/14.t
head/contrib/pjdfstest/tests/symlink/10.t
head/contrib/pjdfstest/tests/symlink/11.t
head/contrib/pjdfstest/tests/truncate/10.t
head/contrib/pjdfstest/tests/unlink/12.t
Modified: head/contrib/pjdfstest/tests/chflags/12.t
==============================================================================
--- head/contrib/pjdfstest/tests/chflags/12.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/chflags/12.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -16,8 +16,8 @@ FreeBSD:UFS)
n1=`namegen`
expect 0 mkdir ${n0} 0755
- n=`mdconfig -a -n -t malloc -s 1m`
- newfs /dev/md${n} >/dev/null
+ n=`mdconfig -a -n -t malloc -s 1m` || exit
+ newfs /dev/md${n} >/dev/null || exit
mount /dev/md${n} ${n0}
expect 0 create ${n0}/${n1} 0644
expect 0 chflags ${n0}/${n1} UF_IMMUTABLE
@@ -34,7 +34,7 @@ FreeBSD:UFS)
expect none stat ${n0}/${n1} flags
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
- mdconfig -d -u ${n}
+ mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
;;
FreeBSD:ZFS)
@@ -43,7 +43,7 @@ FreeBSD:ZFS)
n0=`namegen`
n1=`namegen`
- n=`mdconfig -a -n -t malloc -s 128m`
+ n=`mdconfig -a -n -t malloc -s 128m` || exit
zpool create ${n0} /dev/md${n}
expect 0 create /${n0}/${n1} 0644
expect 0 chflags /${n0}/${n1} UF_NODUMP
@@ -60,7 +60,7 @@ FreeBSD:ZFS)
expect none stat /${n0}/${n1} flags
expect 0 unlink /${n0}/${n1}
zpool destroy ${n0}
- mdconfig -d -u ${n}
+ mdconfig -d -u ${n} || exit
;;
*)
quick_exit
Modified: head/contrib/pjdfstest/tests/chmod/09.t
==============================================================================
--- head/contrib/pjdfstest/tests/chmod/09.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/chmod/09.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect 0 chmod ${n0}/${n1} 0640
expect 0640 stat ${n0}/${n1} mode
@@ -33,5 +33,5 @@ expect 0 lchmod ${n0}/${n1} 0640
expect 0640 stat ${n0}/${n1} mode
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/chown/09.t
==============================================================================
--- head/contrib/pjdfstest/tests/chown/09.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/chown/09.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect 0 chown ${n0}/${n1} 65534 65534
expect 65534,65534 stat ${n0}/${n1} uid,gid
@@ -28,5 +28,5 @@ expect 0 chown ${n0}/${n1} 65533 65533
expect 65533,65533 stat ${n0}/${n1} uid,gid
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/ftruncate/10.t
==============================================================================
--- head/contrib/pjdfstest/tests/ftruncate/10.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/ftruncate/10.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect 0 truncate ${n0}/${n1} 123
expect 123 stat ${n0}/${n1} size
@@ -28,5 +28,5 @@ expect 0 truncate ${n0}/${n1} 1234
expect 1234 stat ${n0}/${n1} size
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/link/05.t
==============================================================================
--- head/contrib/pjdfstest/tests/link/05.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/link/05.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs -i 1 /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs -i 1 /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
i=1
while :; do
@@ -32,5 +32,5 @@ test_check $i -eq 32767
expect EMLINK link ${n0}/${n1} ${n0}/${n2}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/link/14.t
==============================================================================
--- head/contrib/pjdfstest/tests/link/14.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/link/14.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect EXDEV link ${n0}/${n1} ${n2}
expect 0 unlink ${n0}/${n1}
@@ -25,5 +25,5 @@ expect 0 create ${n1} 0644
expect EXDEV link ${n1} ${n0}/${n2}
expect 0 unlink ${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/link/15.t
==============================================================================
--- head/contrib/pjdfstest/tests/link/15.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/link/15.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
i=0
while :; do
@@ -29,5 +29,5 @@ while :; do
done
expect ENOSPC link ${n0}/${n1} ${n0}/${n2}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/link/16.t
==============================================================================
--- head/contrib/pjdfstest/tests/link/16.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/link/16.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect 0 link ${n0}/${n1} ${n0}/${n2}
@@ -30,5 +30,5 @@ expect 0 unlink ${n0}/${n2}
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/mkdir/09.t
==============================================================================
--- head/contrib/pjdfstest/tests/mkdir/09.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/mkdir/09.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 mkdir ${n0}/${n1} 0755
expect 0 rmdir ${n0}/${n1}
mount -ur /dev/md${n}
@@ -25,5 +25,5 @@ mount -uw /dev/md${n}
expect 0 mkdir ${n0}/${n1} 0755
expect 0 rmdir ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/mkdir/11.t
==============================================================================
--- head/contrib/pjdfstest/tests/mkdir/11.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/mkdir/11.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
i=0
while :; do
mkdir ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
done
expect ENOSPC mkdir ${n0}/${n1} 0755
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/mkfifo/08.t
==============================================================================
--- head/contrib/pjdfstest/tests/mkfifo/08.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/mkfifo/08.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 mkfifo ${n0}/${n1} 0644
expect 0 unlink ${n0}/${n1}
mount -ur /dev/md${n}
@@ -25,5 +25,5 @@ mount -uw /dev/md${n}
expect 0 mkfifo ${n0}/${n1} 0644
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/mkfifo/11.t
==============================================================================
--- head/contrib/pjdfstest/tests/mkfifo/11.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/mkfifo/11.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
i=0
while :; do
mkfifo ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
done
expect ENOSPC mkfifo ${n0}/${n1} 0644
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/open/14.t
==============================================================================
--- head/contrib/pjdfstest/tests/open/14.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/open/14.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect 0 open ${n0}/${n1} O_WRONLY
expect 0 open ${n0}/${n1} O_RDWR
@@ -28,5 +28,5 @@ expect EROFS open ${n0}/${n1} O_RDONLY,O
mount -uw /dev/md${n}
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/open/15.t
==============================================================================
--- head/contrib/pjdfstest/tests/open/15.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/open/15.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,14 +14,14 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 open ${n0}/${n1} O_RDONLY,O_CREAT 0644
expect 0 unlink ${n0}/${n1}
mount -ur /dev/md${n}
expect EROFS open ${n0}/${n1} O_RDONLY,O_CREAT 0644
mount -uw /dev/md${n}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/open/19.t
==============================================================================
--- head/contrib/pjdfstest/tests/open/19.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/open/19.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
i=0
while :; do
touch ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
done
expect ENOSPC open ${n0}/${i} O_RDONLY,O_CREAT 0644
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/rename/15.t
==============================================================================
--- head/contrib/pjdfstest/tests/rename/15.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/rename/15.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
for type in regular dir fifo block char socket symlink; do
create_file ${type} ${n0}/${n1}
@@ -30,5 +30,5 @@ for type in regular dir fifo block char
done
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/rename/16.t
==============================================================================
--- head/contrib/pjdfstest/tests/rename/16.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/rename/16.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
mount -ur /dev/md${n}
@@ -28,5 +28,5 @@ expect EROFS rename ${n2} ${n0}/${n2}
expect 0 unlink ${n2}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/rmdir/13.t
==============================================================================
--- head/contrib/pjdfstest/tests/rmdir/13.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/rmdir/13.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -13,10 +13,10 @@ echo "1..3"
n0=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect EBUSY rmdir ${n0}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/rmdir/14.t
==============================================================================
--- head/contrib/pjdfstest/tests/rmdir/14.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/rmdir/14.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,14 +14,14 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 mkdir ${n0}/${n1} 0755
mount -ur /dev/md${n}
expect EROFS rmdir ${n0}/${n1}
mount -uw /dev/md${n}
expect 0 rmdir ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/symlink/10.t
==============================================================================
--- head/contrib/pjdfstest/tests/symlink/10.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/symlink/10.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -15,9 +15,9 @@ n1=`namegen`
n2=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 symlink test ${n0}/${n1}
expect 0 unlink ${n0}/${n1}
@@ -28,5 +28,5 @@ expect 0 symlink test ${n0}/${n1}
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/symlink/11.t
==============================================================================
--- head/contrib/pjdfstest/tests/symlink/11.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/symlink/11.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
i=0
while :; do
ln -s test ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
done
expect ENOSPC symlink test ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/truncate/10.t
==============================================================================
--- head/contrib/pjdfstest/tests/truncate/10.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/truncate/10.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,9 +14,9 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
expect 0 truncate ${n0}/${n1} 123
expect 123 stat ${n0}/${n1} size
@@ -28,5 +28,5 @@ expect 0 truncate ${n0}/${n1} 1234
expect 1234 stat ${n0}/${n1} size
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
Modified: head/contrib/pjdfstest/tests/unlink/12.t
==============================================================================
--- head/contrib/pjdfstest/tests/unlink/12.t Wed Sep 24 22:45:03 2014 (r272086)
+++ head/contrib/pjdfstest/tests/unlink/12.t Wed Sep 24 22:51:16 2014 (r272087)
@@ -14,14 +14,14 @@ n0=`namegen`
n1=`namegen`
expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
expect 0 create ${n0}/${n1} 0644
mount -ur /dev/md${n}
expect EROFS unlink ${n0}/${n1}
mount -uw /dev/md${n}
expect 0 unlink ${n0}/${n1}
umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
expect 0 rmdir ${n0}
More information about the svn-src-all
mailing list