| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA1 |
| 3 |
|
| 4 |
Mike Frysinger wrote: |
| 5 |
> On Wednesday 26 September 2007, Marijn Schouten (hkBst) wrote: |
| 6 |
>> Who's gonna fix usr/lib/portage/bin/ebuild.sh? |
| 7 |
> |
| 8 |
> what's broken in it ? |
| 9 |
> -mike |
| 10 |
|
| 11 |
Well, apparently it checking FEATURES is illegal, plus it seems that it |
| 12 |
contains dead code. Why not replace it with: |
| 13 |
|
| 14 |
|
| 15 |
src_test() { |
| 16 |
if emake -j1 check -n &> /dev/null; then |
| 17 |
vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" |
| 18 |
emake -j1 check || die "Make check failed. See above for details." |
| 19 |
elif emake -j1 test -n &> /dev/null; then |
| 20 |
vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 21 |
emake -j1 test || die "Make test failed. See above for details." |
| 22 |
else |
| 23 |
vecho ">>> Test phase [none]: ${CATEGORY}/${PF}" |
| 24 |
fi |
| 25 |
} |
| 26 |
|
| 27 |
or in patch version: |
| 28 |
|
| 29 |
- --- /usr/lib/portage/bin/ebuild.sh 2007-09-09 12:50:51.000000000 +0200 |
| 30 |
+++ /home/marijn/ebuild.sh 2007-09-27 11:58:18.000000000 +0200 |
| 31 |
@@ -666,16 +666,10 @@ |
| 32 |
src_test() { |
| 33 |
if emake -j1 check -n &> /dev/null; then |
| 34 |
vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" |
| 35 |
- - if ! emake -j1 check; then |
| 36 |
- - hasq test $FEATURES && die "Make check failed. See |
| 37 |
above for details." |
| 38 |
- - hasq test $FEATURES || eerror "Make check failed. See |
| 39 |
above for details." |
| 40 |
- - fi |
| 41 |
+ emake -j1 check || die "Make check failed. See above for details." |
| 42 |
elif emake -j1 test -n &> /dev/null; then |
| 43 |
vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 44 |
- - if ! emake -j1 test; then |
| 45 |
- - hasq test $FEATURES && die "Make test failed. See |
| 46 |
above for details." |
| 47 |
- - hasq test $FEATURES || eerror "Make test failed. See |
| 48 |
above for details." |
| 49 |
- - fi |
| 50 |
+ emake -j1 test || die "Make test failed. See above for details." |
| 51 |
else |
| 52 |
vecho ">>> Test phase [none]: ${CATEGORY}/${PF}" |
| 53 |
fi |
| 54 |
|
| 55 |
|
| 56 |
Marijn |
| 57 |
|
| 58 |
- -- |
| 59 |
Marijn Schouten (hkBst), Gentoo Lisp project |
| 60 |
<http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode |
| 61 |
-----BEGIN PGP SIGNATURE----- |
| 62 |
Version: GnuPG v2.0.7 (GNU/Linux) |
| 63 |
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org |
| 64 |
|
| 65 |
iD8DBQFG+38Qp/VmCx0OL2wRApdnAJ9Yos8HKuhSX3UDS8rEe3qEeU7AbgCgxlOG |
| 66 |
U8eATzDOZf7tFXXnJUD7vZk= |
| 67 |
=4TEF |
| 68 |
-----END PGP SIGNATURE----- |
| 69 |
-- |
| 70 |
gentoo-dev@g.o mailing list |
Archives