From e738400f07fbe369af0d6179fb8761ff22c95f39 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Jan 2012 07:30:11 -0800 Subject: _eapi0_src_test: remove redundant FEATURES checks --- bin/phase-helpers.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'bin') diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 969cecfe0..d65845e47 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -546,15 +546,12 @@ _eapi0_src_test() { local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" if $emake_cmd -j1 check -n &> /dev/null; then vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" - if ! $emake_cmd -j1 check; then - has test $FEATURES && die "Make check failed. See above for details." - has test $FEATURES || eerror "Make check failed. See above for details." - fi + $emake_cmd -j1 check || \ + die "Make check failed. See above for details." elif $emake_cmd -j1 test -n &> /dev/null; then vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - if ! $emake_cmd -j1 test; then - has test $FEATURES && die "Make test failed. See above for details." - has test $FEATURES || eerror "Make test failed. See above for details." + $emake_cmd -j1 test || \ + die "Make test failed. See above for details." fi else vecho ">>> Test phase [none]: ${CATEGORY}/${PF}" -- cgit v1.2.3-1-g7c22