Module Name: src
Committed By: pgoyette
Date: Mon Jun 27 05:29:32 UTC 2016
Modified Files:
src/tests/games: t_factor.sh
Log Message:
Do this more cleanly - put the do-we-have-crypto check inside the actual
do-the-test code rather than in a test's head() code. This way, if we
ever add more tests, we simply need to invoke the common do-the-test code
with an appropriate flag argument rather than duplicating the test.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/tests/games/t_factor.sh:1.9
--- src/tests/games/t_factor.sh:1.8 Mon Jun 27 05:08:18 2016
+++ src/tests/games/t_factor.sh Mon Jun 27 05:29:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_factor.sh,v 1.8 2016/06/27 05:08:18 pgoyette Exp $
+# $NetBSD: t_factor.sh,v 1.9 2016/06/27 05:29:32 pgoyette Exp $
#
# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -27,6 +27,10 @@
expect() {
echo "${2}" >expout
+ ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt )
+ if [ "X$3" != "X" -a $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}
}
@@ -65,11 +69,7 @@ loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop2_body() {
- ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt )
- if [ $ncrypt -eq 0 ] ; then
- atf_skip "crypto needed for huge non-prime factors - PR bin/23663"
- fi
- expect '99999999999991' '99999999999991: 7 13 769231 1428571' ExFail
+ expect '99999999999991' '99999999999991: 7 13 769231 1428571' Need_Crypto
}
atf_init_test_cases()
