Index: head/contrib/pjdfstest/tests/chflags/12.t =================================================================== --- head/contrib/pjdfstest/tests/chflags/12.t (revision 272086) +++ head/contrib/pjdfstest/tests/chflags/12.t (revision 272087) @@ -1,68 +1,68 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/12.t 211352 2010-08-15 21:24:17Z pjd $ desc="chflags returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh require chflags case "${os}:${fs}" in FreeBSD:UFS) echo "1..14" n0=`namegen` 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 expect UF_IMMUTABLE stat ${n0}/${n1} flags expect 0 chflags ${n0}/${n1} none expect none stat ${n0}/${n1} flags mount -ur /dev/md${n} expect EROFS chflags ${n0}/${n1} UF_IMMUTABLE expect none stat ${n0}/${n1} flags mount -uw /dev/md${n} expect 0 chflags ${n0}/${n1} UF_IMMUTABLE expect UF_IMMUTABLE stat ${n0}/${n1} flags expect 0 chflags ${n0}/${n1} none 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) echo "1..12" 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 expect UF_NODUMP stat /${n0}/${n1} flags expect 0 chflags /${n0}/${n1} none expect none stat /${n0}/${n1} flags zfs set readonly=on ${n0} expect EROFS chflags /${n0}/${n1} UF_NODUMP expect none stat /${n0}/${n1} flags zfs set readonly=off ${n0} expect 0 chflags /${n0}/${n1} UF_NODUMP expect UF_NODUMP stat /${n0}/${n1} flags expect 0 chflags /${n0}/${n1} none 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 ;; esac Index: head/contrib/pjdfstest/tests/chmod/09.t =================================================================== --- head/contrib/pjdfstest/tests/chmod/09.t (revision 272086) +++ head/contrib/pjdfstest/tests/chmod/09.t (revision 272087) @@ -1,37 +1,37 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/09.t 211352 2010-08-15 21:24:17Z pjd $ desc="chmod returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..15" 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 expect 0 lchmod ${n0}/${n1} 0530 expect 0530 stat ${n0}/${n1} mode mount -ur /dev/md${n} expect EROFS chmod ${n0}/${n1} 0600 expect EROFS lchmod ${n0}/${n1} 0600 expect 0530 stat ${n0}/${n1} mode mount -uw /dev/md${n} expect 0 chmod ${n0}/${n1} 0600 expect 0600 stat ${n0}/${n1} mode 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} Index: head/contrib/pjdfstest/tests/chown/09.t =================================================================== --- head/contrib/pjdfstest/tests/chown/09.t (revision 272086) +++ head/contrib/pjdfstest/tests/chown/09.t (revision 272087) @@ -1,32 +1,32 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/chown/09.t 211352 2010-08-15 21:24:17Z pjd $ desc="chown returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..10" 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 mount -ur /dev/md${n} expect EROFS chown ${n0}/${n1} 65533 65533 expect 65534,65534 stat ${n0}/${n1} uid,gid mount -uw /dev/md${n} 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} Index: head/contrib/pjdfstest/tests/ftruncate/10.t =================================================================== --- head/contrib/pjdfstest/tests/ftruncate/10.t (revision 272086) +++ head/contrib/pjdfstest/tests/ftruncate/10.t (revision 272087) @@ -1,32 +1,32 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/10.t 211352 2010-08-15 21:24:17Z pjd $ desc="truncate returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..10" 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 mount -ur /dev/md${n} expect EROFS truncate ${n0}/${n1} 1234 expect 123 stat ${n0}/${n1} size mount -uw /dev/md${n} 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} Index: head/contrib/pjdfstest/tests/link/05.t =================================================================== --- head/contrib/pjdfstest/tests/link/05.t (revision 272086) +++ head/contrib/pjdfstest/tests/link/05.t (revision 272087) @@ -1,36 +1,36 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/link/05.t 211352 2010-08-15 21:24:17Z pjd $ desc="link returns EMLINK if the link count of the file named by name1 would exceed 32767" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..5" n0=`namegen` 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 link ${n0}/${n1} ${n0}/${i} >/dev/null 2>&1 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` done 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} Index: head/contrib/pjdfstest/tests/link/14.t =================================================================== --- head/contrib/pjdfstest/tests/link/14.t (revision 272086) +++ head/contrib/pjdfstest/tests/link/14.t (revision 272087) @@ -1,29 +1,29 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/link/14.t 211352 2010-08-15 21:24:17Z pjd $ desc="link returns EXDEV if the source and the destination files are on different file systems" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}" = "FreeBSD" ] || quick_exit echo "1..8" n0=`namegen` 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} 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} Index: head/contrib/pjdfstest/tests/link/15.t =================================================================== --- head/contrib/pjdfstest/tests/link/15.t (revision 272086) +++ head/contrib/pjdfstest/tests/link/15.t (revision 272087) @@ -1,33 +1,33 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/link/15.t 211352 2010-08-15 21:24:17Z pjd $ desc="link returns ENOSPC if the directory in which the entry for the new link is being placed cannot be extended because there is no space left on the file system containing the directory" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..4" n0=`namegen` 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 link ${n0}/${n1} ${n0}/${i} >/dev/null 2>&1 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` 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} Index: head/contrib/pjdfstest/tests/link/16.t =================================================================== --- head/contrib/pjdfstest/tests/link/16.t (revision 272086) +++ head/contrib/pjdfstest/tests/link/16.t (revision 272087) @@ -1,34 +1,34 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/link/16.t 211352 2010-08-15 21:24:17Z pjd $ desc="link returns EROFS if the requested link requires writing in a directory on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}" = "FreeBSD" ] || quick_exit echo "1..9" n0=`namegen` 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} expect 0 unlink ${n0}/${n2} mount -ur /dev/md${n} expect EROFS link ${n0}/${n1} ${n0}/${n2} mount -uw /dev/md${n} expect 0 link ${n0}/${n1} ${n0}/${n2} 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} Index: head/contrib/pjdfstest/tests/mkdir/09.t =================================================================== --- head/contrib/pjdfstest/tests/mkdir/09.t (revision 272086) +++ head/contrib/pjdfstest/tests/mkdir/09.t (revision 272087) @@ -1,29 +1,29 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/09.t 211352 2010-08-15 21:24:17Z pjd $ desc="mkdir returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..7" 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} expect EROFS mkdir ${n0}/${n1} 0755 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} Index: head/contrib/pjdfstest/tests/mkdir/11.t =================================================================== --- head/contrib/pjdfstest/tests/mkdir/11.t (revision 272086) +++ head/contrib/pjdfstest/tests/mkdir/11.t (revision 272087) @@ -1,31 +1,31 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/11.t 211352 2010-08-15 21:24:17Z pjd $ desc="mkdir returns ENOSPC if there are no free inodes on the file system on which the directory is being created" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..3" 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 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` done expect ENOSPC mkdir ${n0}/${n1} 0755 umount /dev/md${n} -mdconfig -d -u ${n} +mdconfig -d -u ${n} || exit expect 0 rmdir ${n0} Index: head/contrib/pjdfstest/tests/mkfifo/08.t =================================================================== --- head/contrib/pjdfstest/tests/mkfifo/08.t (revision 272086) +++ head/contrib/pjdfstest/tests/mkfifo/08.t (revision 272087) @@ -1,29 +1,29 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/08.t 211352 2010-08-15 21:24:17Z pjd $ desc="mkfifo returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..7" 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} expect EROFS mkfifo ${n0}/${n1} 0644 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} Index: head/contrib/pjdfstest/tests/mkfifo/11.t =================================================================== --- head/contrib/pjdfstest/tests/mkfifo/11.t (revision 272086) +++ head/contrib/pjdfstest/tests/mkfifo/11.t (revision 272087) @@ -1,31 +1,31 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/11.t 211352 2010-08-15 21:24:17Z pjd $ desc="mkfifo returns ENOSPC if there are no free inodes on the file system on which the file is being created" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..3" 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 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` done expect ENOSPC mkfifo ${n0}/${n1} 0644 umount /dev/md${n} -mdconfig -d -u ${n} +mdconfig -d -u ${n} || exit expect 0 rmdir ${n0} Index: head/contrib/pjdfstest/tests/open/14.t =================================================================== --- head/contrib/pjdfstest/tests/open/14.t (revision 272086) +++ head/contrib/pjdfstest/tests/open/14.t (revision 272087) @@ -1,32 +1,32 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/open/14.t 211352 2010-08-15 21:24:17Z pjd $ desc="open returns EROFS if the named file resides on a read-only file system, and the file is to be modified" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..10" 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 expect 0 open ${n0}/${n1} O_RDONLY,O_TRUNC mount -ur /dev/md${n} expect EROFS open ${n0}/${n1} O_WRONLY expect EROFS open ${n0}/${n1} O_RDWR expect EROFS open ${n0}/${n1} O_RDONLY,O_TRUNC 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} Index: head/contrib/pjdfstest/tests/open/15.t =================================================================== --- head/contrib/pjdfstest/tests/open/15.t (revision 272086) +++ head/contrib/pjdfstest/tests/open/15.t (revision 272087) @@ -1,27 +1,27 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/open/15.t 211352 2010-08-15 21:24:17Z pjd $ desc="open returns EROFS when O_CREAT is specified and the named file would reside on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..5" 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} Index: head/contrib/pjdfstest/tests/open/19.t =================================================================== --- head/contrib/pjdfstest/tests/open/19.t (revision 272086) +++ head/contrib/pjdfstest/tests/open/19.t (revision 272087) @@ -1,31 +1,31 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/open/19.t 211352 2010-08-15 21:24:17Z pjd $ desc="open returns ENOSPC when O_CREAT is specified, the file does not exist, and there are no free inodes on the file system on which the file is being created" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..3" 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 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` 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} Index: head/contrib/pjdfstest/tests/rename/15.t =================================================================== --- head/contrib/pjdfstest/tests/rename/15.t (revision 272086) +++ head/contrib/pjdfstest/tests/rename/15.t (revision 272087) @@ -1,34 +1,34 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/rename/15.t 211352 2010-08-15 21:24:17Z pjd $ desc="rename returns EXDEV if the link named by 'to' and the file named by 'from' are on different file systems" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}" = "FreeBSD" ] || quick_exit echo "1..23" n0=`namegen` 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} expect EXDEV rename ${n0}/${n1} ${n2} if [ "${type}" = "dir" ]; then expect 0 rmdir ${n0}/${n1} else expect 0 unlink ${n0}/${n1} fi done umount /dev/md${n} -mdconfig -d -u ${n} +mdconfig -d -u ${n} || exit expect 0 rmdir ${n0} Index: head/contrib/pjdfstest/tests/rename/16.t =================================================================== --- head/contrib/pjdfstest/tests/rename/16.t (revision 272086) +++ head/contrib/pjdfstest/tests/rename/16.t (revision 272087) @@ -1,32 +1,32 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/rename/16.t 211352 2010-08-15 21:24:17Z pjd $ desc="rename returns EROFS if the requested link requires writing in a directory on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}" = "FreeBSD" ] || quick_exit echo "1..8" n0=`namegen` 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} expect EROFS rename ${n0}/${n1} ${n0}/${n2} expect EROFS rename ${n0}/${n1} ${n2} expect 0 create ${n2} 0644 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} Index: head/contrib/pjdfstest/tests/rmdir/13.t =================================================================== --- head/contrib/pjdfstest/tests/rmdir/13.t (revision 272086) +++ head/contrib/pjdfstest/tests/rmdir/13.t (revision 272087) @@ -1,22 +1,22 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/13.t 211352 2010-08-15 21:24:17Z pjd $ desc="rmdir returns EBUSY if the directory to be removed is the mount point for a mounted file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}" = "FreeBSD" ] || quick_exit 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} Index: head/contrib/pjdfstest/tests/rmdir/14.t =================================================================== --- head/contrib/pjdfstest/tests/rmdir/14.t (revision 272086) +++ head/contrib/pjdfstest/tests/rmdir/14.t (revision 272087) @@ -1,27 +1,27 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/14.t 211352 2010-08-15 21:24:17Z pjd $ desc="rmdir returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..5" 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} Index: head/contrib/pjdfstest/tests/symlink/10.t =================================================================== --- head/contrib/pjdfstest/tests/symlink/10.t (revision 272086) +++ head/contrib/pjdfstest/tests/symlink/10.t (revision 272087) @@ -1,32 +1,32 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/10.t 211352 2010-08-15 21:24:17Z pjd $ desc="symlink returns EROFS if the file name2 would reside on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..7" n0=`namegen` 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} mount -ur /dev/md${n} expect EROFS symlink test ${n0}/${n1} mount -uw /dev/md${n} 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} Index: head/contrib/pjdfstest/tests/symlink/11.t =================================================================== --- head/contrib/pjdfstest/tests/symlink/11.t (revision 272086) +++ head/contrib/pjdfstest/tests/symlink/11.t (revision 272087) @@ -1,31 +1,31 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/11.t 211352 2010-08-15 21:24:17Z pjd $ desc="symlink returns ENOSPC if there are no free inodes on the file system on which the symbolic link is being created" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..3" 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 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` done expect ENOSPC symlink test ${n0}/${n1} umount /dev/md${n} -mdconfig -d -u ${n} +mdconfig -d -u ${n} || exit expect 0 rmdir ${n0} Index: head/contrib/pjdfstest/tests/truncate/10.t =================================================================== --- head/contrib/pjdfstest/tests/truncate/10.t (revision 272086) +++ head/contrib/pjdfstest/tests/truncate/10.t (revision 272087) @@ -1,32 +1,32 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/10.t 211352 2010-08-15 21:24:17Z pjd $ desc="truncate returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..10" 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 mount -ur /dev/md${n} expect EROFS truncate ${n0}/${n1} 1234 expect 123 stat ${n0}/${n1} size mount -uw /dev/md${n} 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} Index: head/contrib/pjdfstest/tests/unlink/12.t =================================================================== --- head/contrib/pjdfstest/tests/unlink/12.t (revision 272086) +++ head/contrib/pjdfstest/tests/unlink/12.t (revision 272087) @@ -1,27 +1,27 @@ #!/bin/sh # $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/12.t 211352 2010-08-15 21:24:17Z pjd $ desc="unlink returns EROFS if the named file resides on a read-only file system" dir=`dirname $0` . ${dir}/../misc.sh [ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit echo "1..5" 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}