Sun Oct 11 18:43:51 2020 UTC ()
simplify: use two arguments again, suggested by kre@


(christos)
diff -r1.10 -r1.11 src/tests/games/t_factor.sh
cvs diff -r1.10 -r1.11 src/tests/games/t_factor.sh (expand / switch to unified diff)

--- src/tests/games/t_factor.sh 2020/10/11 17:17:39 1.10
+++ src/tests/games/t_factor.sh 2020/10/11 18:43:50 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: t_factor.sh,v 1.10 2020/10/11 17:17:39 christos Exp $ 1# $NetBSD: t_factor.sh,v 1.11 2020/10/11 18:43:50 christos Exp $
2# 2#
3# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. 3# Copyright (c) 2007, 2008, 2009 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#
@@ -16,148 +16,148 @@ @@ -16,148 +16,148 @@
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
28expect() { 28expect() {
29 echo "${3}" >expout 29 echo "${2}" >expout
30 ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt ) 30 ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt )
31 if [ "X$3" != "X" -a $ncrypt -eq 0 ] ; then  31 if [ -n "$3" ] && [ $ncrypt -eq 0 ] ; then
32 atf_skip "crypto needed for huge non-prime factors - PR bin/23663" 32 atf_skip "crypto needed for huge non-prime factors - PR bin/23663"
33 fi 33 fi
34 atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} ${2} 34 atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
35} 35}
36 36
37atf_test_case overflow1 37atf_test_case overflow1
38overflow1_head() { 38overflow1_head() {
39 atf_set "descr" "Tests for overflow conditions" 39 atf_set "descr" "Tests for overflow conditions"
40 atf_set "require.progs" "/usr/games/factor" 40 atf_set "require.progs" "/usr/games/factor"
41} 41}
42overflow1_body() { 42overflow1_body() {
43 expect "" '8675309' '8675309: 8675309' 43 expect '8675309' '8675309: 8675309'
44} 44}
45 45
46atf_test_case overflow2 46atf_test_case overflow2
47overflow2_head() { 47overflow2_head() {
48 atf_set "descr" "Tests for overflow conditions" 48 atf_set "descr" "Tests for overflow conditions"
49 atf_set "require.progs" "/usr/games/factor" 49 atf_set "require.progs" "/usr/games/factor"
50} 50}
51overflow2_body() { 51overflow2_body() {
52 expect "" '6172538568' '6172538568: 2 2 2 3 7 17 2161253' 52 expect '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
53} 53}
54 54
55atf_test_case loop1 55atf_test_case loop1
56loop1_head() { 56loop1_head() {
57 atf_set "descr" "Tests some cases that once locked the program" \ 57 atf_set "descr" "Tests some cases that once locked the program" \
58 "in an infinite loop" 58 "in an infinite loop"
59 atf_set "require.progs" "/usr/games/factor" 59 atf_set "require.progs" "/usr/games/factor"
60} 60}
61loop1_body() { 61loop1_body() {
62 expect "" '2147483647111311' '2147483647111311: 3 3 3 131 607148331103' 62 expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
63} 63}
64 64
65atf_test_case loop2 65atf_test_case loop2
66loop2_head() { 66loop2_head() {
67 atf_set "descr" "Tests some cases that once locked the program" \ 67 atf_set "descr" "Tests some cases that once locked the program" \
68 "in an infinite loop" 68 "in an infinite loop"
69 atf_set "require.progs" "/usr/games/factor" 69 atf_set "require.progs" "/usr/games/factor"
70} 70}
71loop2_body() { 71loop2_body() {
72 expect "" '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto 72 expect '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
73} 73}
74 74
75 75
76atf_test_case h_overflow1 76atf_test_case h_overflow1
77h_overflow1_head() { 77h_overflow1_head() {
78 atf_set "descr" "Tests for h_overflow conditions" 78 atf_set "descr" "Tests for h_overflow conditions"
79 atf_set "require.progs" "/usr/games/factor" 79 atf_set "require.progs" "/usr/games/factor"
80} 80}
81h_overflow1_body() { 81h_overflow1_body() {
82 expect -h '8675309' '8675309: 8675309' 82 expect '-h 8675309' '8675309: 8675309'
83} 83}
84 84
85atf_test_case h_overflow2 85atf_test_case h_overflow2
86h_overflow2_head() { 86h_overflow2_head() {
87 atf_set "descr" "Tests for h_overflow conditions" 87 atf_set "descr" "Tests for h_overflow conditions"
88 atf_set "require.progs" "/usr/games/factor" 88 atf_set "require.progs" "/usr/games/factor"
89} 89}
90h_overflow2_body() { 90h_overflow2_body() {
91 expect -h '6172538568' '6172538568: 2^3 3 7 17 2161253' 91 expect '-h 6172538568' '6172538568: 2^3 3 7 17 2161253'
92} 92}
93 93
94atf_test_case h_loop1 94atf_test_case h_loop1
95h_loop1_head() { 95h_loop1_head() {
96 atf_set "descr" "Tests some cases that once locked the program" \ 96 atf_set "descr" "Tests some cases that once locked the program" \
97 "in an infinite h_loop" 97 "in an infinite h_loop"
98 atf_set "require.progs" "/usr/games/factor" 98 atf_set "require.progs" "/usr/games/factor"
99} 99}
100h_loop1_body() { 100h_loop1_body() {
101 expect -h '2147483647111311' '2147483647111311: 3^3 131 607148331103' 101 expect '-h 2147483647111311' '2147483647111311: 3^3 131 607148331103'
102} 102}
103 103
104atf_test_case h_loop2 104atf_test_case h_loop2
105h_loop2_head() { 105h_loop2_head() {
106 atf_set "descr" "Tests some cases that once locked the program" \ 106 atf_set "descr" "Tests some cases that once locked the program" \
107 "in an infinite h_loop" 107 "in an infinite h_loop"
108 atf_set "require.progs" "/usr/games/factor" 108 atf_set "require.progs" "/usr/games/factor"
109} 109}
110h_loop2_body() { 110h_loop2_body() {
111 expect -h '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto 111 expect '-h 99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
112} 112}
113 113
114 114
115atf_test_case hx_overflow1 115atf_test_case hx_overflow1
116hx_overflow1_head() { 116hx_overflow1_head() {
117 atf_set "descr" "Tests for hx_overflow conditions" 117 atf_set "descr" "Tests for hx_overflow conditions"
118 atf_set "require.progs" "/usr/games/factor" 118 atf_set "require.progs" "/usr/games/factor"
119} 119}
120hx_overflow1_body() { 120hx_overflow1_body() {
121 expect -hx '8675309' '0x845FED: 0x845FED' 121 expect '-hx 8675309' '0x845FED: 0x845FED'
122} 122}
123 123
124atf_test_case hx_overflow2 124atf_test_case hx_overflow2
125hx_overflow2_head() { 125hx_overflow2_head() {
126 atf_set "descr" "Tests for hx_overflow conditions" 126 atf_set "descr" "Tests for hx_overflow conditions"
127 atf_set "require.progs" "/usr/games/factor" 127 atf_set "require.progs" "/usr/games/factor"
128} 128}
129hx_overflow2_body() { 129hx_overflow2_body() {
130 expect -hx '6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65' 130 expect '-hx 6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65'
131} 131}
132 132
133atf_test_case hx_loop1 133atf_test_case hx_loop1
134hx_loop1_head() { 134hx_loop1_head() {
135 atf_set "descr" "Tests some cases that once locked the program" \ 135 atf_set "descr" "Tests some cases that once locked the program" \
136 "in an infinite hx_loop" 136 "in an infinite hx_loop"
137 atf_set "require.progs" "/usr/games/factor" 137 atf_set "require.progs" "/usr/games/factor"
138} 138}
139hx_loop1_body() { 139hx_loop1_body() {
140 expect -hx '2147483647111311' '0x7A11FFFF2708F: 0x3^3 0x83 0x8D5CDC505F' 140 expect '-hx 2147483647111311' '0x7A11FFFF2708F: 0x3^3 0x83 0x8D5CDC505F'
141} 141}
142 142
143atf_test_case hx_loop2 143atf_test_case hx_loop2
144hx_loop2_head() { 144hx_loop2_head() {
145 atf_set "descr" "Tests some cases that once locked the program" \ 145 atf_set "descr" "Tests some cases that once locked the program" \
146 "in an infinite hx_loop" 146 "in an infinite hx_loop"
147 atf_set "require.progs" "/usr/games/factor" 147 atf_set "require.progs" "/usr/games/factor"
148} 148}
149hx_loop2_body() { 149hx_loop2_body() {
150 expect -hx '99999999999991' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto 150 expect '-hx 99999999999991' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto
151} 151}
152 152
153atf_init_test_cases() 153atf_init_test_cases()
154{ 154{
155 atf_add_test_case overflow1 155 atf_add_test_case overflow1
156 atf_add_test_case overflow2 156 atf_add_test_case overflow2
157 atf_add_test_case loop1 157 atf_add_test_case loop1
158 atf_add_test_case loop2 158 atf_add_test_case loop2
159 159
160 atf_add_test_case h_overflow1 160 atf_add_test_case h_overflow1
161 atf_add_test_case h_overflow2 161 atf_add_test_case h_overflow2
162 atf_add_test_case h_loop1 162 atf_add_test_case h_loop1
163 atf_add_test_case h_loop2 163 atf_add_test_case h_loop2