Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-30.0.1581.2.ebuild chromium-29.0.1547.32.ebuild ChangeLog
Date: Wed, 31 Jul 2013 22:29:36
Message-Id: 20130731222933.1FAB72171C@flycatcher.gentoo.org
1 floppym 13/07/31 22:29:33
2
3 Modified: chromium-30.0.1581.2.ebuild
4 chromium-29.0.1547.32.ebuild ChangeLog
5 Log:
6 Adjust src_test so that we always run all tests instead of dying on the first failure.
7
8 (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
9
10 Revision Changes Path
11 1.2 www-client/chromium/chromium-30.0.1581.2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-30.0.1581.2.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-30.0.1581.2.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-30.0.1581.2.ebuild?r1=1.1&r2=1.2
16
17 Index: chromium-30.0.1581.2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1581.2.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- chromium-30.0.1581.2.ebuild 31 Jul 2013 15:40:26 -0000 1.1
24 +++ chromium-30.0.1581.2.ebuild 31 Jul 2013 22:29:32 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1581.2.ebuild,v 1.1 2013/07/31 15:40:26 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1581.2.ebuild,v 1.2 2013/07/31 22:29:32 floppym Exp $
30
31 EAPI="5"
32 PYTHON_COMPAT=( python{2_6,2_7} )
33 @@ -403,26 +403,40 @@
34
35 src_test() {
36 # For more info see bug #350349.
37 - local mylocale='en_US.utf8'
38 - if ! locale -a | grep -q "$mylocale"; then
39 - eerror "${PN} requires ${mylocale} locale for tests"
40 + local LC_ALL="en_US.utf8"
41 +
42 + if ! locale -a | grep -q "${LC_ALL}"; then
43 + eerror "${PN} requires ${LC_ALL} locale for tests"
44 eerror "Please read the following guides for more information:"
45 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
46 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
47 - die "locale ${mylocale} is not supported"
48 + die "locale ${LC_ALL} is not supported"
49 fi
50
51 + # If we have the right locale, export it to the environment
52 + export LC_ALL
53 +
54 # For more info see bug #370957.
55 if [[ $UID -eq 0 ]]; then
56 die "Tests must be run as non-root. Please use FEATURES=userpriv."
57 fi
58
59 + # virtualmake dies on failure, so we run our tests in a function
60 + VIRTUALX_COMMAND="chromium_test" virtualmake
61 +}
62 +
63 +chromium_test() {
64 + # Keep track of the cumulative exit status for all tests
65 + local exitstatus=0
66 +
67 runtest() {
68 local cmd=$1
69 shift
70 - local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
71 - einfo "${cmd}" "${filter}"
72 - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
73 + local IFS=:
74 + set -- "${cmd}" "--gtest_filter=-$*"
75 + einfo "$@"
76 + "$@"
77 + (( exitstatus |= $? ))
78 }
79
80 local excluded_base_unittests=(
81 @@ -467,6 +481,8 @@
82 "SQLiteFeaturesTest.FTS2" # bug #461286
83 )
84 runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
85 +
86 + return ${exitstatus}
87 }
88
89 src_install() {
90
91
92
93 1.2 www-client/chromium/chromium-29.0.1547.32.ebuild
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-29.0.1547.32.ebuild?rev=1.2&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-29.0.1547.32.ebuild?rev=1.2&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-29.0.1547.32.ebuild?r1=1.1&r2=1.2
98
99 Index: chromium-29.0.1547.32.ebuild
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.32.ebuild,v
102 retrieving revision 1.1
103 retrieving revision 1.2
104 diff -u -r1.1 -r1.2
105 --- chromium-29.0.1547.32.ebuild 26 Jul 2013 02:27:05 -0000 1.1
106 +++ chromium-29.0.1547.32.ebuild 31 Jul 2013 22:29:32 -0000 1.2
107 @@ -1,6 +1,6 @@
108 # Copyright 1999-2013 Gentoo Foundation
109 # Distributed under the terms of the GNU General Public License v2
110 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.32.ebuild,v 1.1 2013/07/26 02:27:05 floppym Exp $
111 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-29.0.1547.32.ebuild,v 1.2 2013/07/31 22:29:32 floppym Exp $
112
113 EAPI="5"
114 PYTHON_COMPAT=( python{2_6,2_7} )
115 @@ -397,26 +397,40 @@
116
117 src_test() {
118 # For more info see bug #350349.
119 - local mylocale='en_US.utf8'
120 - if ! locale -a | grep -q "$mylocale"; then
121 - eerror "${PN} requires ${mylocale} locale for tests"
122 + local LC_ALL="en_US.utf8"
123 +
124 + if ! locale -a | grep -q "${LC_ALL}"; then
125 + eerror "${PN} requires ${LC_ALL} locale for tests"
126 eerror "Please read the following guides for more information:"
127 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
128 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
129 - die "locale ${mylocale} is not supported"
130 + die "locale ${LC_ALL} is not supported"
131 fi
132
133 + # If we have the right locale, export it to the environment
134 + export LC_ALL
135 +
136 # For more info see bug #370957.
137 if [[ $UID -eq 0 ]]; then
138 die "Tests must be run as non-root. Please use FEATURES=userpriv."
139 fi
140
141 + # virtualmake dies on failure, so we run our tests in a function
142 + VIRTUALX_COMMAND="chromium_test" virtualmake
143 +}
144 +
145 +chromium_test() {
146 + # Keep track of the cumulative exit status for all tests
147 + local exitstatus=0
148 +
149 runtest() {
150 local cmd=$1
151 shift
152 - local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
153 - einfo "${cmd}" "${filter}"
154 - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
155 + local IFS=:
156 + set -- "${cmd}" "--gtest_filter=-$*"
157 + einfo "$@"
158 + "$@"
159 + (( exitstatus |= $? ))
160 }
161
162 local excluded_base_unittests=(
163 @@ -461,6 +475,8 @@
164 "SQLiteFeaturesTest.FTS2" # bug #461286
165 )
166 runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
167 +
168 + return ${exitstatus}
169 }
170
171 src_install() {
172
173
174
175 1.925 www-client/chromium/ChangeLog
176
177 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.925&view=markup
178 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.925&content-type=text/plain
179 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.924&r2=1.925
180
181 Index: ChangeLog
182 ===================================================================
183 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
184 retrieving revision 1.924
185 retrieving revision 1.925
186 diff -u -r1.924 -r1.925
187 --- ChangeLog 31 Jul 2013 15:40:26 -0000 1.924
188 +++ ChangeLog 31 Jul 2013 22:29:32 -0000 1.925
189 @@ -1,6 +1,11 @@
190 # ChangeLog for www-client/chromium
191 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
192 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.924 2013/07/31 15:40:26 phajdan.jr Exp $
193 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.925 2013/07/31 22:29:32 floppym Exp $
194 +
195 + 31 Jul 2013; Mike Gilbert <floppym@g.o> chromium-29.0.1547.32.ebuild,
196 + chromium-30.0.1581.2.ebuild:
197 + Adjust src_test so that we always run all tests instead of dying on the first
198 + failure.
199
200 *chromium-30.0.1581.2 (31 Jul 2013)
Report Message
Find on MARC Find on Google Groups