Module Name: src
Committed By: riz
Date: Mon Jun 7 03:39:41 UTC 2010
Modified Files:
src/tests/fs/tmpfs: t_create.sh t_mkdir.sh
Log Message:
Use atf_check to su in a couple cases, to make the test failure
easier to understand when the unprivileged user has /sbin/nologin
for a shell.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/tmpfs/t_create.sh \
src/tests/fs/tmpfs/t_mkdir.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/tmpfs/t_create.sh
diff -u src/tests/fs/tmpfs/t_create.sh:1.4 src/tests/fs/tmpfs/t_create.sh:1.5
--- src/tests/fs/tmpfs/t_create.sh:1.4 Fri Jun 4 08:39:40 2010
+++ src/tests/fs/tmpfs/t_create.sh Mon Jun 7 03:39:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_create.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_create.sh,v 1.5 2010/06/07 03:39:41 riz Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -86,12 +86,12 @@
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
- su ${user} -c 'touch b/a'
+ atf_check -s eq:0 -o empty -e empty su ${user} -c 'touch b/a'
eval $(stat -s b/a)
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 0 ] || atf_fail "Incorrect group"
- su ${user} -c 'touch c/a'
+ atf_check -s eq:0 -o empty -e empty su ${user} -c 'touch c/a'
eval $(stat -s c/a)
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
Index: src/tests/fs/tmpfs/t_mkdir.sh
diff -u src/tests/fs/tmpfs/t_mkdir.sh:1.4 src/tests/fs/tmpfs/t_mkdir.sh:1.5
--- src/tests/fs/tmpfs/t_mkdir.sh:1.4 Fri Jun 4 08:39:40 2010
+++ src/tests/fs/tmpfs/t_mkdir.sh Mon Jun 7 03:39:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_mkdir.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_mkdir.sh,v 1.5 2010/06/07 03:39:41 riz Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -115,12 +115,12 @@
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
- su ${user} -c 'mkdir b/a'
+ atf_check -s eq:0 -o empty -e empty su ${user} -c 'mkdir b/a'
eval $(stat -s b/a)
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 0 ] || atf_fail "Incorrect group"
- su ${user} -c 'mkdir c/a'
+ atf_check -s eq:0 -o empty -e empty su ${user} -c 'mkdir c/a'
eval $(stat -s c/a)
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
