Module Name: src
Committed By: christos
Date: Sun Oct 11 18:43:51 UTC 2020
Modified Files:
src/tests/games: t_factor.sh
Log Message:
simplify: use two arguments again, suggested by kre@
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/games/t_factor.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/games/t_factor.sh
diff -u src/tests/games/t_factor.sh:1.10 src/tests/games/t_factor.sh:1.11
--- src/tests/games/t_factor.sh:1.10 Sun Oct 11 13:17:39 2020
+++ src/tests/games/t_factor.sh Sun Oct 11 14:43:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_factor.sh,v 1.10 2020/10/11 17:17:39 christos Exp $
+# $NetBSD: t_factor.sh,v 1.11 2020/10/11 18:43:50 christos Exp $
#
# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,12 +26,12 @@
#
expect() {
- echo "${3}" >expout
+ echo "${2}" >expout
ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt )
- if [ "X$3" != "X" -a $ncrypt -eq 0 ] ; then
+ if [ -n "$3" ] && [ $ncrypt -eq 0 ] ; then
atf_skip "crypto needed for huge non-prime factors - PR bin/23663"
fi
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} ${2}
+ atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
}
atf_test_case overflow1
@@ -40,7 +40,7 @@ overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
overflow1_body() {
- expect "" '8675309' '8675309: 8675309'
+ expect '8675309' '8675309: 8675309'
}
atf_test_case overflow2
@@ -49,7 +49,7 @@ overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
overflow2_body() {
- expect "" '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
+ expect '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
}
atf_test_case loop1
@@ -59,7 +59,7 @@ loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop1_body() {
- expect "" '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
+ expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
}
atf_test_case loop2
@@ -69,7 +69,7 @@ loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop2_body() {
- expect "" '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
+ expect '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
}
@@ -79,7 +79,7 @@ h_overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_overflow1_body() {
- expect -h '8675309' '8675309: 8675309'
+ expect '-h 8675309' '8675309: 8675309'
}
atf_test_case h_overflow2
@@ -88,7 +88,7 @@ h_overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_overflow2_body() {
- expect -h '6172538568' '6172538568: 2^3 3 7 17 2161253'
+ expect '-h 6172538568' '6172538568: 2^3 3 7 17 2161253'
}
atf_test_case h_loop1
@@ -98,7 +98,7 @@ h_loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_loop1_body() {
- expect -h '2147483647111311' '2147483647111311: 3^3 131 607148331103'
+ expect '-h 2147483647111311' '2147483647111311: 3^3 131 607148331103'
}
atf_test_case h_loop2
@@ -108,7 +108,7 @@ h_loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_loop2_body() {
- expect -h '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
+ expect '-h 99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
}
@@ -118,7 +118,7 @@ hx_overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_overflow1_body() {
- expect -hx '8675309' '0x845FED: 0x845FED'
+ expect '-hx 8675309' '0x845FED: 0x845FED'
}
atf_test_case hx_overflow2
@@ -127,7 +127,7 @@ hx_overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_overflow2_body() {
- expect -hx '6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65'
+ expect '-hx 6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65'
}
atf_test_case hx_loop1
@@ -137,7 +137,7 @@ hx_loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_loop1_body() {
- expect -hx '2147483647111311' '0x7A11FFFF2708F: 0x3^3 0x83 0x8D5CDC505F'
+ expect '-hx 2147483647111311' '0x7A11FFFF2708F: 0x3^3 0x83 0x8D5CDC505F'
}
atf_test_case hx_loop2
@@ -147,7 +147,7 @@ hx_loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_loop2_body() {
- expect -hx '99999999999991' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto
+ expect '-hx 99999999999991' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto
}
atf_init_test_cases()
