[src/trunk]: src/tests/games Do this more cleanly - put the do-we-have-crypto...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60e1d932a644
branches:  trunk
changeset: 346118:60e1d932a644
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Jun 27 05:29:32 2016 +0000

description:
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.

diffstat:

 tests/games/t_factor.sh |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r cc080ba1e39a -r 60e1d932a644 tests/games/t_factor.sh
--- a/tests/games/t_factor.sh   Mon Jun 27 05:08:18 2016 +0000
+++ b/tests/games/t_factor.sh   Mon Jun 27 05:29:32 2016 +0000
@@ -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 @@
        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()