diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-01-17 07:30:11 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-01-17 07:30:11 -0800 |
| commit | e738400f07fbe369af0d6179fb8761ff22c95f39 (patch) | |
| tree | 61cfc312c78bc8d3f170ac768b66a5b0cbd75599 /bin/phase-helpers.sh | |
| parent | caf67ac8df3528382ff960b2de4cf853a14a0141 (diff) | |
| download | portage-e738400f07fbe369af0d6179fb8761ff22c95f39.tar.gz portage-e738400f07fbe369af0d6179fb8761ff22c95f39.tar.bz2 portage-e738400f07fbe369af0d6179fb8761ff22c95f39.zip | |
_eapi0_src_test: remove redundant FEATURES checks
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 11 |
1 files changed, 4 insertions, 7 deletions
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}" |