Gentoo Archives: gentoo-portage-dev

From: "Marijn Schouten (hkBst)" <hkBst@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] src_test cleanup
Date: Tue, 30 Oct 2007 17:36:23
Message-Id: 47276BAC.2020303@gentoo.org
1 -----BEGIN PGP SIGNED MESSAGE-----
2 Hash: SHA1
3
4 The following patch was also on gentoo-dev before. It eliminates some dead
5 code paths from default src_test and in the process eliminates references to
6 FEATURES which is good for allowing ebuild.sh to be shared with other package
7 managers.
8
9 Marijn
10
11 diff -uw /usr/lib64/portage/bin/ebuild.sh ~/ebuild.sh
12 @@ -709,16 +666,10 @@
13 src_test() {
14 if emake -j1 check -n &> /dev/null; then
15 vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
16 - - if ! emake -j1 check; then
17 - - hasq test $FEATURES && die "Make check failed. See
18 above for details."
19 - - hasq test $FEATURES || eerror "Make check failed. See
20 above for details."
21 - - fi
22 + emake -j1 check || die "Make check failed. See above for details."
23 elif emake -j1 test -n &> /dev/null; then
24 vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
25 - - if ! emake -j1 test; then
26 - - hasq test $FEATURES && die "Make test failed. See
27 above for details."
28 - - hasq test $FEATURES || eerror "Make test failed. See
29 above for details."
30 - - fi
31 + emake -j1 test || die "Make test failed. See above for details."
32 else
33 vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"
34 fi
35
36 - --
37 Marijn Schouten (hkBst), Gentoo Lisp project
38 <http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode
39 -----BEGIN PGP SIGNATURE-----
40 Version: GnuPG v2.0.7 (GNU/Linux)
41 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
42
43 iD8DBQFHJ2usp/VmCx0OL2wRArFMAKC7kPj/i9pxUNOM3nsG99qzIFP9AQCfepvh
44 HmpExOB6pc4ZZFlxOFC3G1I=
45 =eboG
46 -----END PGP SIGNATURE-----
47 --
48 gentoo-portage-dev@g.o mailing list