Mon Jul 6 10:32:18 2020 UTC ()
Sleep more.


(jruoho)
diff -r1.1 -r1.2 src/tests/usr.sbin/execsnoop/t_execsnoop.sh
diff -r1.1 -r1.2 src/tests/usr.sbin/opensnoop/t_opensnoop.sh
cvs diff -r1.1 -r1.2 src/tests/usr.sbin/execsnoop/t_execsnoop.sh (switch to unified diff)

--- src/tests/usr.sbin/execsnoop/t_execsnoop.sh 2020/06/30 14:30:49 1.1
+++ src/tests/usr.sbin/execsnoop/t_execsnoop.sh 2020/07/06 10:32:18 1.2
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1# $NetBSD: t_execsnoop.sh,v 1.1 2020/06/30 14:30:49 jruoho Exp $ 1# $NetBSD: t_execsnoop.sh,v 1.2 2020/07/06 10:32:18 jruoho Exp $
2# 2#
3# Copyright (c) 2020 The NetBSD Foundation, Inc. 3# Copyright (c) 2020 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Jukka Ruohonen. 7# by Jukka Ruohonen.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
15# notice, this list of conditions and the following disclaimer in the 15# notice, this list of conditions and the following disclaimer in the
16# documentation and/or other materials provided with the distribution. 16# documentation and/or other materials provided with the distribution.
17# 17#
18# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 18# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
19# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 19# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
20# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 20# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
21# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 21# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
22# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 22# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28# POSSIBILITY OF SUCH DAMAGE. 28# POSSIBILITY OF SUCH DAMAGE.
29# 29#
30tmp="/tmp/execsnoop" 30tmp="/tmp/execsnoop"
31 31
32atf_test_case basic cleanup 32atf_test_case basic cleanup
33basic_head() { 33basic_head() {
34 atf_set "require.user" "root" 34 atf_set "require.user" "root"
35 atf_set "require.progs" "execsnoop" 35 atf_set "require.progs" "execsnoop"
36 atf_set "descr" "Test that DTrace's execsnoop works (cf. kern/53417)" 36 atf_set "descr" "Test that DTrace's execsnoop works (cf. kern/53417)"
37} 37}
38 38
39basic_body() { 39basic_body() {
40 40
41 n=10 41 n=10
42 atf_check -s exit:0 -o ignore -e empty -x "execsnoop > $tmp &" 42 atf_check -s exit:0 -o ignore -e empty -x "execsnoop > $tmp &"
43 sleep 1 43 sleep 1
44 44
45 while [ $n -gt 0 ]; do 45 while [ $n -gt 0 ]; do
46 whoami 46 whoami
47 n=$(expr $n - 1) 47 n=$(expr $n - 1)
48 done 48 done
49 49
50 sleep 1 50 sleep 3
51 pkill -9 execsnoop 51 pkill -9 execsnoop
52 52
53 if [ ! $(cat $tmp | grep "whoami" | wc -l) -eq 10 ]; then 53 if [ ! $(cat $tmp | grep "whoami" | wc -l) -eq 10 ]; then
54 atf_fail "execsnoop does not work" 54 atf_fail "execsnoop does not work"
55 fi 55 fi
56 56
57 atf_pass 57 atf_pass
58} 58}
59 59
60basic_cleanup() { 60basic_cleanup() {
61 61
62 if [ -f $tmp ]; then 62 if [ -f $tmp ]; then
63 rm $tmp 63 rm $tmp
64 fi 64 fi
65} 65}
66 66
67atf_init_test_cases() { 67atf_init_test_cases() {
68 atf_add_test_case basic 68 atf_add_test_case basic
69} 69}
cvs diff -r1.1 -r1.2 src/tests/usr.sbin/opensnoop/t_opensnoop.sh (switch to unified diff)

--- src/tests/usr.sbin/opensnoop/t_opensnoop.sh 2020/06/30 14:30:50 1.1
+++ src/tests/usr.sbin/opensnoop/t_opensnoop.sh 2020/07/06 10:32:18 1.2
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1# $NetBSD: t_opensnoop.sh,v 1.1 2020/06/30 14:30:50 jruoho Exp $ 1# $NetBSD: t_opensnoop.sh,v 1.2 2020/07/06 10:32:18 jruoho Exp $
2# 2#
3# Copyright (c) 2020 The NetBSD Foundation, Inc. 3# Copyright (c) 2020 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Jukka Ruohonen. 7# by Jukka Ruohonen.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
15# notice, this list of conditions and the following disclaimer in the 15# notice, this list of conditions and the following disclaimer in the
16# documentation and/or other materials provided with the distribution. 16# documentation and/or other materials provided with the distribution.
17# 17#
18# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 18# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
19# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 19# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
20# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 20# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
21# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 21# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
22# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 22# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28# POSSIBILITY OF SUCH DAMAGE. 28# POSSIBILITY OF SUCH DAMAGE.
29# 29#
30tmp="/tmp/opensnoop" 30tmp="/tmp/opensnoop"
31 31
32atf_test_case basic cleanup 32atf_test_case basic cleanup
33basic_head() { 33basic_head() {
34 atf_set "require.user" "root" 34 atf_set "require.user" "root"
35 atf_set "require.progs" "opensnoop" 35 atf_set "require.progs" "opensnoop"
36 atf_set "descr" "Test that DTrace's opensnoop works (cf. kern/53417)" 36 atf_set "descr" "Test that DTrace's opensnoop works (cf. kern/53417)"
37} 37}
38 38
39basic_body() { 39basic_body() {
40 40
41 n=10 41 n=10
42 atf_check -s exit:0 -o ignore -e empty -x "opensnoop > $tmp &" 42 atf_check -s exit:0 -o ignore -e empty -x "opensnoop > $tmp &"
43 sleep 1 43 sleep 1
44 44
45 while [ $n -gt 0 ]; do 45 while [ $n -gt 0 ]; do
46 whoami 46 whoami
47 n=$(expr $n - 1) 47 n=$(expr $n - 1)
48 done 48 done
49 49
50 sleep 1 50 sleep 3
51 pkill -9 opensnoop 51 pkill -9 opensnoop
52 52
53 if [ ! $(cat $tmp | grep "/etc/spwd.db" | wc -l) -eq 10 ]; then 53 if [ ! $(cat $tmp | grep "/etc/spwd.db" | wc -l) -eq 10 ]; then
54 atf_fail "opensnoop does not work" 54 atf_fail "opensnoop does not work"
55 fi 55 fi
56 56
57 atf_pass 57 atf_pass
58} 58}
59 59
60basic_cleanup() { 60basic_cleanup() {
61 61
62 if [ -f $tmp ]; then 62 if [ -f $tmp ]; then
63 rm $tmp 63 rm $tmp
64 fi 64 fi
65} 65}
66 66
67atf_init_test_cases() { 67atf_init_test_cases() {
68 atf_add_test_case basic 68 atf_add_test_case basic
69} 69}