Tue Dec 6 18:18:59 2011 UTC ()
Remove expected failure now that PR/44708 is fixed.


(njoly)
diff -r1.2 -r1.3 src/tests/fs/zfs/t_zpool.sh

cvs diff -r1.2 -r1.3 src/tests/fs/zfs/t_zpool.sh (switch to unified diff)

--- src/tests/fs/zfs/t_zpool.sh 2011/09/19 06:38:02 1.2
+++ src/tests/fs/zfs/t_zpool.sh 2011/12/06 18:18:59 1.3
@@ -1,68 +1,66 @@ @@ -1,68 +1,66 @@
1# $NetBSD: t_zpool.sh,v 1.2 2011/09/19 06:38:02 jruoho Exp $ 1# $NetBSD: t_zpool.sh,v 1.3 2011/12/06 18:18:59 njoly Exp $
2# 2#
3# Copyright (c) 2011 The NetBSD Foundation, Inc. 3# Copyright (c) 2011 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# Redistribution and use in source and binary forms, with or without 6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions 7# modification, are permitted provided that the following conditions
8# are met: 8# are met:
9# 1. Redistributions of source code must retain the above copyright 9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer. 10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright 11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the 12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution. 13# documentation and/or other materials provided with the distribution.
14# 14#
15# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 15# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
16# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 16# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
17# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 17# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 18# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
19# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 19# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 20# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 21# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 22# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 23# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 24# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25# POSSIBILITY OF SUCH DAMAGE. 25# POSSIBILITY OF SUCH DAMAGE.
26# 26#
27 27
28server='rump_server -lrumpvfs -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m' 28server='rump_server -lrumpvfs -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m'
29 29
30export RUMP_SERVER=unix://zsuck 30export RUMP_SERVER=unix://zsuck
31 31
32atf_test_case create cleanup 32atf_test_case create cleanup
33create_head() 33create_head()
34{ 34{
35 atf_set "descr" "basic zpool create" 35 atf_set "descr" "basic zpool create"
36} 36}
37 37
38IFS=' ' 38IFS=' '
39exmount='rumpfs on / type rumpfs (local) 39exmount='rumpfs on / type rumpfs (local)
40jippo on /jippo type zfs (local) 40jippo on /jippo type zfs (local)
41' 41'
42 42
43create_body() 43create_body()
44{ 44{
45 45
46 atf_expect_fail "PR misc/44708" 
47 
48 atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER} 46 atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER}
49 47
50 export LD_PRELOAD=/usr/lib/librumphijack.so 48 export LD_PRELOAD=/usr/lib/librumphijack.so
51 export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo 49 export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo
52 atf_check -s exit:0 zpool create jippo /dk 50 atf_check -s exit:0 zpool create jippo /dk
53 51
54 export RUMPHIJACK=vfs=all 52 export RUMPHIJACK=vfs=all
55 atf_check -s exit:0 -o inline:"${exmount}" mount 53 atf_check -s exit:0 -o inline:"${exmount}" mount
56} 54}
57 55
58create_cleanup() 56create_cleanup()
59{ 57{
60 58
61 rump.halt 59 rump.halt
62} 60}
63 61
64atf_init_test_cases() 62atf_init_test_cases()
65{ 63{
66 64
67 atf_add_test_case create 65 atf_add_test_case create
68} 66}