Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-9999-r1.ebuild ChangeLog
Date: Wed, 31 Jul 2013 22:31:09
Message-Id: 20130731223102.F117D2171C@flycatcher.gentoo.org
1 floppym 13/07/31 22:31:02
2
3 Modified: chromium-9999-r1.ebuild ChangeLog
4 Log:
5 Apply src_test change to live ebuild.
6
7 (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
8
9 Revision Changes Path
10 1.206 www-client/chromium/chromium-9999-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.206&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.206&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.205&r2=1.206
15
16 Index: chromium-9999-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v
19 retrieving revision 1.205
20 retrieving revision 1.206
21 diff -u -r1.205 -r1.206
22 --- chromium-9999-r1.ebuild 31 Jul 2013 15:40:26 -0000 1.205
23 +++ chromium-9999-r1.ebuild 31 Jul 2013 22:31:02 -0000 1.206
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.205 2013/07/31 15:40:26 phajdan.jr Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.206 2013/07/31 22:31:02 floppym Exp $
29
30 EAPI="5"
31 PYTHON_COMPAT=( python{2_6,2_7} )
32 @@ -474,26 +474,40 @@
33
34 src_test() {
35 # For more info see bug #350349.
36 - local mylocale='en_US.utf8'
37 - if ! locale -a | grep -q "$mylocale"; then
38 - eerror "${PN} requires ${mylocale} locale for tests"
39 + local LC_ALL="en_US.utf8"
40 +
41 + if ! locale -a | grep -q "${LC_ALL}"; then
42 + eerror "${PN} requires ${LC_ALL} locale for tests"
43 eerror "Please read the following guides for more information:"
44 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
45 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
46 - die "locale ${mylocale} is not supported"
47 + die "locale ${LC_ALL} is not supported"
48 fi
49
50 + # If we have the right locale, export it to the environment
51 + export LC_ALL
52 +
53 # For more info see bug #370957.
54 if [[ $UID -eq 0 ]]; then
55 die "Tests must be run as non-root. Please use FEATURES=userpriv."
56 fi
57
58 + # virtualmake dies on failure, so we run our tests in a function
59 + VIRTUALX_COMMAND="chromium_test" virtualmake
60 +}
61 +
62 +chromium_test() {
63 + # Keep track of the cumulative exit status for all tests
64 + local exitstatus=0
65 +
66 runtest() {
67 local cmd=$1
68 shift
69 - local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
70 - einfo "${cmd}" "${filter}"
71 - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
72 + local IFS=:
73 + set -- "${cmd}" "--gtest_filter=-$*"
74 + einfo "$@"
75 + "$@"
76 + (( exitstatus |= $? ))
77 }
78
79 local excluded_base_unittests=(
80 @@ -537,6 +551,8 @@
81 "SQLiteFeaturesTest.FTS2" # bug #461286
82 )
83 runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
84 +
85 + return ${exitstatus}
86 }
87
88 src_install() {
89
90
91
92 1.926 www-client/chromium/ChangeLog
93
94 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.926&view=markup
95 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.926&content-type=text/plain
96 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.925&r2=1.926
97
98 Index: ChangeLog
99 ===================================================================
100 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
101 retrieving revision 1.925
102 retrieving revision 1.926
103 diff -u -r1.925 -r1.926
104 --- ChangeLog 31 Jul 2013 22:29:32 -0000 1.925
105 +++ ChangeLog 31 Jul 2013 22:31:02 -0000 1.926
106 @@ -1,6 +1,9 @@
107 # ChangeLog for www-client/chromium
108 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
109 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.925 2013/07/31 22:29:32 floppym Exp $
110 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.926 2013/07/31 22:31:02 floppym Exp $
111 +
112 + 31 Jul 2013; Mike Gilbert <floppym@g.o> chromium-9999-r1.ebuild:
113 + Apply src_test change to live ebuild.
114
115 31 Jul 2013; Mike Gilbert <floppym@g.o> chromium-29.0.1547.32.ebuild,
116 chromium-30.0.1581.2.ebuild: