| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
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 | # |
| @@ -33,28 +33,26 @@ atf_test_case create cleanup | | | @@ -33,28 +33,26 @@ atf_test_case create cleanup |
33 | create_head() | | 33 | create_head() |
34 | { | | 34 | { |
35 | atf_set "descr" "basic zpool create" | | 35 | atf_set "descr" "basic zpool create" |
36 | } | | 36 | } |
37 | | | 37 | |
38 | IFS=' ' | | 38 | IFS=' ' |
39 | exmount='rumpfs on / type rumpfs (local) | | 39 | exmount='rumpfs on / type rumpfs (local) |
40 | jippo on /jippo type zfs (local) | | 40 | jippo on /jippo type zfs (local) |
41 | ' | | 41 | ' |
42 | | | 42 | |
43 | create_body() | | 43 | create_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 | |
58 | create_cleanup() | | 56 | create_cleanup() |
59 | { | | 57 | { |
60 | | | 58 | |