Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests Adjusts tests after import of atf-0.12:
details: https://anonhg.NetBSD.org/src/rev/13e82e325f5c
branches: trunk
changeset: 758545:13e82e325f5c
user: jmmv <jmmv%NetBSD.org@localhost>
date: Sun Nov 07 17:51:16 2010 +0000
description:
Adjusts tests after import of atf-0.12:
- The use.fs property is gone.
- Mark the tests/fs/t_create:attrs test as broken when using the default
unprivileged-user:_atf setting. This probably deserves a fix somehow
but I'm not sure at this point.
diffstat:
tests/crypto/libcrypto/t_libcrypto.sh | 4 +--
tests/dev/audio/t_pad.sh | 3 +-
tests/dev/dm/t_dm.sh | 3 +-
tests/fs/common/h_fsmacros.h | 3 +-
tests/fs/common/snapshot.c | 3 +-
tests/fs/ffs/t_fifos.c | 3 +-
tests/fs/ffs/t_mount.c | 4 +--
tests/fs/lfs/t_pr.c | 3 +-
tests/fs/nfs/t_mountd.c | 3 +-
tests/fs/psshfs/t_psshfs.sh | 4 +--
tests/fs/tmpfs/t_create.sh | 10 ++++---
tests/fs/tmpfs/t_devices.sh | 3 +-
tests/fs/tmpfs/t_dots.sh | 4 +--
tests/fs/tmpfs/t_exec.sh | 3 +-
tests/fs/tmpfs/t_link.sh | 5 +---
tests/fs/tmpfs/t_mkdir.sh | 7 +----
tests/fs/tmpfs/t_mknod.sh | 8 +-----
tests/fs/tmpfs/t_mount.sh | 9 +------
tests/fs/tmpfs/t_pipes.sh | 3 +-
tests/fs/tmpfs/t_read_write.sh | 4 +--
tests/fs/tmpfs/t_readdir.sh | 6 +---
tests/fs/tmpfs/t_remove.sh | 6 +---
tests/fs/tmpfs/t_rename.sh | 11 +-------
tests/fs/tmpfs/t_rmdir.sh | 11 +-------
tests/fs/tmpfs/t_setattr.sh | 12 +--------
tests/fs/tmpfs/t_sizes.sh | 6 +---
tests/fs/tmpfs/t_sockets.sh | 3 +-
tests/fs/tmpfs/t_statvfs.sh | 3 +-
tests/fs/tmpfs/t_symlink.sh | 6 +---
tests/fs/tmpfs/t_times.sh | 6 +---
tests/fs/tmpfs/t_trail_slash.sh | 3 +-
tests/fs/tmpfs/t_truncate.sh | 3 +-
tests/fs/tmpfs/t_vnd.sh | 3 +-
tests/fs/tmpfs/t_vnode_leak.sh | 3 +-
tests/fs/union/t_basic.c | 3 +-
tests/games/t_factor.sh | 4 +--
tests/include/t_bitstring.c | 8 +-----
tests/ipf/h_common.sh | 8 +-----
tests/kernel/kqueue/read/t_fifo.c | 5 +--
tests/kernel/kqueue/read/t_file.c | 5 +--
tests/kernel/kqueue/read/t_file2.c | 5 +--
tests/kernel/kqueue/write/t_fifo.c | 5 +--
tests/kernel/t_mkdir.c | 5 +--
tests/kernel/t_umount.sh | 3 +-
tests/lib/csu/t_crt0.sh | 5 +---
tests/lib/libpthread/t_atexit.sh | 3 +-
tests/modules/t_modload.sh | 6 +---
tests/net/carp/t_basic.c | 5 +--
tests/net/icmp/t_forward.c | 5 +--
tests/net/icmp/t_ping.c | 9 +-----
tests/rump/rumpvfs/t_etfs.c | 6 +---
tests/sys/rc/t_rc_d_cli.sh | 10 +-------
tests/util/awk/t_awk.sh | 6 +---
tests/util/config/t_config.sh | 3 +-
tests/util/cut/t_cut.sh | 6 +---
tests/util/df/t_df.sh | 4 +--
tests/util/grep/t_grep.sh | 7 +----
tests/util/id/t_groups.sh | 4 +--
tests/util/id/t_id.sh | 8 +-----
tests/util/id/t_whoami.sh | 4 +--
tests/util/m4/t_m4.sh | 3 +-
tests/util/make/t_make.sh | 3 +-
tests/util/mtree/t_mtree.sh | 9 +------
tests/util/sdiff/t_sdiff.sh | 6 +---
tests/util/sh/t_wait.sh | 3 +-
tests/util/sort/t_sort.sh | 44 +----------------------------------
tests/util/t_cp.sh | 12 +--------
tests/util/t_gzip.sh | 6 +---
tests/util/t_pax.sh | 3 +-
tests/util/t_tar.sh | 3 +-
70 files changed, 83 insertions(+), 322 deletions(-)
diffs (truncated from 2638 to 300 lines):
diff -r 700c486885ac -r 13e82e325f5c tests/crypto/libcrypto/t_libcrypto.sh
--- a/tests/crypto/libcrypto/t_libcrypto.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/crypto/libcrypto/t_libcrypto.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.1 2010/07/10 16:43:25 jmmv Exp $
+# $NetBSD: t_libcrypto.sh,v 1.2 2010/11/07 17:51:16 jmmv Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -61,7 +61,6 @@
conf_head()
{
atf_set "descr" "Checks configuration modules"
- atf_set "use.fs" "true"
}
conf_body()
{
@@ -86,7 +85,6 @@
threads_head()
{
atf_set "descr" "Checks threading"
- atf_set "use.fs" "true"
}
threads_body()
{
diff -r 700c486885ac -r 13e82e325f5c tests/dev/audio/t_pad.sh
--- a/tests/dev/audio/t_pad.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/dev/audio/t_pad.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_pad.sh,v 1.2 2010/08/04 13:49:48 pooka Exp $
+# $NetBSD: t_pad.sh,v 1.3 2010/11/07 17:51:17 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,6 @@
{
atf_set "descr" "Check pad driver output against known-good output"
- atf_set "use.fs" "true"
}
pad_output_body()
diff -r 700c486885ac -r 13e82e325f5c tests/dev/dm/t_dm.sh
--- a/tests/dev/dm/t_dm.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/dev/dm/t_dm.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_dm.sh,v 1.1 2010/10/06 11:24:55 haad Exp $
+# $NetBSD: t_dm.sh,v 1.2 2010/11/07 17:51:17 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -29,7 +29,6 @@
dm_test_head()
{
atf_set "descr" "Check dm driver routines and create lineary, stripe mapped disks"
- atf_set "use.fs" "true"
}
dm_test_body()
diff -r 700c486885ac -r 13e82e325f5c tests/fs/common/h_fsmacros.h
--- a/tests/fs/common/h_fsmacros.h Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/common/h_fsmacros.h Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.20 2010/08/26 08:19:18 pooka Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.21 2010/11/07 17:51:17 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -101,7 +101,6 @@
ATF_TC_HEAD(fs##_##func,tc) \
{ \
atf_tc_set_md_var(tc, "descr", type " test for " desc); \
- atf_tc_set_md_var(tc, "use.fs", "true"); \
atf_tc_set_md_var(tc, "X-fs.type", type); \
} \
void *fs##func##tmp; \
diff -r 700c486885ac -r 13e82e325f5c tests/fs/common/snapshot.c
--- a/tests/fs/common/snapshot.c Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/common/snapshot.c Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: snapshot.c,v 1.4 2010/06/04 08:39:40 jmmv Exp $ */
+/* $NetBSD: snapshot.c,v 1.5 2010/11/07 17:51:17 jmmv Exp $ */
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -18,7 +18,6 @@
{
atf_tc_set_md_var(tc, "descr", "basic snapshot features");
- atf_tc_set_md_var(tc, "use.fs", "true");
}
static void
diff -r 700c486885ac -r 13e82e325f5c tests/fs/ffs/t_fifos.c
--- a/tests/fs/ffs/t_fifos.c Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/ffs/t_fifos.c Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fifos.c,v 1.4 2010/06/04 08:39:40 jmmv Exp $ */
+/* $NetBSD: t_fifos.c,v 1.5 2010/11/07 17:51:17 jmmv Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -24,7 +24,6 @@
{
atf_tc_set_md_var(tc, "descr", "test fifo support in ffs");
atf_tc_set_md_var(tc, "timeout", "5");
- atf_tc_set_md_var(tc, "use.fs", "true");
}
#define teststr1 "raving & drooling"
diff -r 700c486885ac -r 13e82e325f5c tests/fs/ffs/t_mount.c
--- a/tests/fs/ffs/t_mount.c Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/ffs/t_mount.c Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mount.c,v 1.10 2010/08/09 19:36:30 pooka Exp $ */
+/* $NetBSD: t_mount.c,v 1.11 2010/11/07 17:51:17 jmmv Exp $ */
/*
* Basic tests for mounting
@@ -31,7 +31,6 @@
ATF_TC_HEAD(48Kimage, tc)
{
atf_tc_set_md_var(tc, "descr", "mount small 48K ffs image");
- atf_tc_set_md_var(tc, "use.fs", "true");
}
ATF_TC_BODY(48Kimage, tc)
@@ -51,7 +50,6 @@
atf_tc_set_md_var(tc, "descr", "mounts file system with "
"blocksize > MAXPHYS");
- atf_tc_set_md_var(tc, "use.fs", "true");
/* PR kern/43727 */
}
diff -r 700c486885ac -r 13e82e325f5c tests/fs/lfs/t_pr.c
--- a/tests/fs/lfs/t_pr.c Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/lfs/t_pr.c Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.3 2010/07/03 08:31:37 jmmv Exp $ */
+/* $NetBSD: t_pr.c,v 1.4 2010/11/07 17:51:17 jmmv Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -25,7 +25,6 @@
atf_tc_set_md_var(tc, "descr", "mknod(2) hangs on LFS (PR kern/43503)");
atf_tc_set_md_var(tc, "timeout", "1");
- atf_tc_set_md_var(tc, "use.fs", "true");
}
#define IMGNAME "disk.img"
diff -r 700c486885ac -r 13e82e325f5c tests/fs/nfs/t_mountd.c
--- a/tests/fs/nfs/t_mountd.c Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/nfs/t_mountd.c Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mountd.c,v 1.2 2010/08/01 15:38:27 pooka Exp $ */
+/* $NetBSD: t_mountd.c,v 1.3 2010/11/07 17:51:18 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,6 @@
atf_tc_set_md_var(tc, "descr", "test for service interrupt while "
"mountd handles SIGHUP");
- atf_tc_set_md_var(tc, "use.fs", "true");
}
static volatile int quit;
diff -r 700c486885ac -r 13e82e325f5c tests/fs/psshfs/t_psshfs.sh
--- a/tests/fs/psshfs/t_psshfs.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/psshfs/t_psshfs.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_psshfs.sh,v 1.1 2010/07/06 14:06:22 pooka Exp $
+# $NetBSD: t_psshfs.sh,v 1.2 2010/11/07 17:51:18 jmmv Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -129,7 +129,6 @@
inode_nos_head() {
atf_set "descr" "Checks that different files get different inode" \
"numbers"
- atf_set "use.fs" "true"
}
inode_nos_body() {
require_puffs
@@ -172,7 +171,6 @@
atf_test_case pwd cleanup
pwd_head() {
atf_set "descr" "Checks that pwd works correctly"
- atf_set "use.fs" "true"
}
pwd_body() {
require_puffs
diff -r 700c486885ac -r 13e82e325f5c tests/fs/tmpfs/t_create.sh
--- a/tests/fs/tmpfs/t_create.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/tmpfs/t_create.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_create.sh,v 1.5 2010/06/07 03:39:41 riz Exp $
+# $NetBSD: t_create.sh,v 1.6 2010/11/07 17:51:18 jmmv Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,7 +33,6 @@
create_head() {
atf_set "descr" "Verifies that files can be created"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
create_body() {
test_mount
@@ -51,7 +50,6 @@
"attributes"
atf_set "require.config" "unprivileged-user"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
attrs_body() {
# Allow the unprivileged user to access the work directory.
@@ -86,6 +84,11 @@
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
+ if [ ${user} = _atf ]; then
+ atf_expect_fail "We can't 'su ${user}' to run a test command" \
+ "because it doesn't have a login shell"
+ fi
+
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"
@@ -104,7 +107,6 @@
atf_set "descr" "Verifies that creating a file raises the correct" \
"kqueue events"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
kqueue_body() {
test_mount
diff -r 700c486885ac -r 13e82e325f5c tests/fs/tmpfs/t_devices.sh
--- a/tests/fs/tmpfs/t_devices.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/tmpfs/t_devices.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_devices.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_devices.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -29,7 +29,6 @@
basic_head() {
atf_set "descr" "Tests that special devices work"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
basic_body() {
test_mount
diff -r 700c486885ac -r 13e82e325f5c tests/fs/tmpfs/t_dots.sh
--- a/tests/fs/tmpfs/t_dots.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/tmpfs/t_dots.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_dots.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_dots.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,6 @@
atf_set "descr" "Verifies that looking up '.' and '..' in" \
"top-level directories works"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
topdir_body() {
test_mount
@@ -47,7 +46,6 @@
atf_set "descr" "Verifies that looking up '.' and '..' in" \
"top-level directories works"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
nesteddir_body() {
test_mount
diff -r 700c486885ac -r 13e82e325f5c tests/fs/tmpfs/t_exec.sh
--- a/tests/fs/tmpfs/t_exec.sh Sun Nov 07 17:49:33 2010 +0000
+++ b/tests/fs/tmpfs/t_exec.sh Sun Nov 07 17:51:16 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_exec.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_exec.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -31,7 +31,6 @@
"within the file system (i.e., whether getpages" \
"works)"
atf_set "require.user" "root"
- atf_set "use.fs" "true"
}
basic_body() {
test_mount
diff -r 700c486885ac -r 13e82e325f5c tests/fs/tmpfs/t_link.sh
--- a/tests/fs/tmpfs/t_link.sh Sun Nov 07 17:49:33 2010 +0000
Home |
Main Index |
Thread Index |
Old Index