1 |
commit: 368cf8c604417576891a8f2efe1d33eab7f246dd |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 14 13:28:23 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 14 13:28:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368cf8c6 |
7 |
|
8 |
dev-vcs/git: Minor adjustments in src_test() |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
dev-vcs/git/git-2.16.1.ebuild | 14 +++++++------- |
13 |
dev-vcs/git/git-9999-r1.ebuild | 14 +++++++------- |
14 |
dev-vcs/git/git-9999-r2.ebuild | 14 +++++++------- |
15 |
dev-vcs/git/git-9999-r3.ebuild | 14 +++++++------- |
16 |
dev-vcs/git/git-9999.ebuild | 14 +++++++------- |
17 |
5 files changed, 35 insertions(+), 35 deletions(-) |
18 |
|
19 |
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild |
20 |
index 67a7f811554..e9f0c242bcf 100644 |
21 |
--- a/dev-vcs/git/git-2.16.1.ebuild |
22 |
+++ b/dev-vcs/git/git-2.16.1.ebuild |
23 |
@@ -572,7 +572,7 @@ src_install() { |
24 |
} |
25 |
|
26 |
src_test() { |
27 |
- local disabled="t9128-git-svn-cmd-branch.sh" |
28 |
+ local disabled="" |
29 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
30 |
t9400-git-cvsserver-server.sh \ |
31 |
t9401-git-cvsserver-crlf.sh \ |
32 |
@@ -603,7 +603,7 @@ src_test() { |
33 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
34 |
if ! has_version app-arch/unzip ; then |
35 |
einfo "Disabling tar-tree tests" |
36 |
- disabled="${disabled} t5000-tar-tree.sh" |
37 |
+ disabled+=" t5000-tar-tree.sh" |
38 |
fi |
39 |
|
40 |
cvs=0 |
41 |
@@ -612,10 +612,10 @@ src_test() { |
42 |
if [[ $cvs -eq 1 ]]; then |
43 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
44 |
ewarn "You should retest with FEATURES=userpriv!" |
45 |
- disabled="${disabled} ${tests_cvs}" |
46 |
+ disabled+=" ${tests_cvs}" |
47 |
fi |
48 |
einfo "Skipping other tests that require being non-root" |
49 |
- disabled="${disabled} ${tests_nonroot}" |
50 |
+ disabled+=" ${tests_nonroot}" |
51 |
else |
52 |
[[ $cvs -gt 0 ]] && \ |
53 |
has_version dev-vcs/cvs && \ |
54 |
@@ -625,17 +625,17 @@ src_test() { |
55 |
let cvs=$cvs+1 |
56 |
if [[ $cvs -lt 3 ]]; then |
57 |
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
58 |
- disabled="${disabled} ${tests_cvs}" |
59 |
+ disabled+=" ${tests_cvs}" |
60 |
fi |
61 |
fi |
62 |
|
63 |
if ! use perl ; then |
64 |
einfo "Disabling tests that need Perl" |
65 |
- disabled="${disabled} ${tests_perl}" |
66 |
+ disabled+=" ${tests_perl}" |
67 |
fi |
68 |
|
69 |
einfo "Disabling tests that fail with SVN 1.7" |
70 |
- disabled="${disabled} ${test_svn}" |
71 |
+ disabled+=" ${test_svn}" |
72 |
|
73 |
# Reset all previously disabled tests |
74 |
cd "${S}/t" |
75 |
|
76 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
77 |
index 67a7f811554..e9f0c242bcf 100644 |
78 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
79 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
80 |
@@ -572,7 +572,7 @@ src_install() { |
81 |
} |
82 |
|
83 |
src_test() { |
84 |
- local disabled="t9128-git-svn-cmd-branch.sh" |
85 |
+ local disabled="" |
86 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
87 |
t9400-git-cvsserver-server.sh \ |
88 |
t9401-git-cvsserver-crlf.sh \ |
89 |
@@ -603,7 +603,7 @@ src_test() { |
90 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
91 |
if ! has_version app-arch/unzip ; then |
92 |
einfo "Disabling tar-tree tests" |
93 |
- disabled="${disabled} t5000-tar-tree.sh" |
94 |
+ disabled+=" t5000-tar-tree.sh" |
95 |
fi |
96 |
|
97 |
cvs=0 |
98 |
@@ -612,10 +612,10 @@ src_test() { |
99 |
if [[ $cvs -eq 1 ]]; then |
100 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
101 |
ewarn "You should retest with FEATURES=userpriv!" |
102 |
- disabled="${disabled} ${tests_cvs}" |
103 |
+ disabled+=" ${tests_cvs}" |
104 |
fi |
105 |
einfo "Skipping other tests that require being non-root" |
106 |
- disabled="${disabled} ${tests_nonroot}" |
107 |
+ disabled+=" ${tests_nonroot}" |
108 |
else |
109 |
[[ $cvs -gt 0 ]] && \ |
110 |
has_version dev-vcs/cvs && \ |
111 |
@@ -625,17 +625,17 @@ src_test() { |
112 |
let cvs=$cvs+1 |
113 |
if [[ $cvs -lt 3 ]]; then |
114 |
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
115 |
- disabled="${disabled} ${tests_cvs}" |
116 |
+ disabled+=" ${tests_cvs}" |
117 |
fi |
118 |
fi |
119 |
|
120 |
if ! use perl ; then |
121 |
einfo "Disabling tests that need Perl" |
122 |
- disabled="${disabled} ${tests_perl}" |
123 |
+ disabled+=" ${tests_perl}" |
124 |
fi |
125 |
|
126 |
einfo "Disabling tests that fail with SVN 1.7" |
127 |
- disabled="${disabled} ${test_svn}" |
128 |
+ disabled+=" ${test_svn}" |
129 |
|
130 |
# Reset all previously disabled tests |
131 |
cd "${S}/t" |
132 |
|
133 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
134 |
index 67a7f811554..e9f0c242bcf 100644 |
135 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
136 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
137 |
@@ -572,7 +572,7 @@ src_install() { |
138 |
} |
139 |
|
140 |
src_test() { |
141 |
- local disabled="t9128-git-svn-cmd-branch.sh" |
142 |
+ local disabled="" |
143 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
144 |
t9400-git-cvsserver-server.sh \ |
145 |
t9401-git-cvsserver-crlf.sh \ |
146 |
@@ -603,7 +603,7 @@ src_test() { |
147 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
148 |
if ! has_version app-arch/unzip ; then |
149 |
einfo "Disabling tar-tree tests" |
150 |
- disabled="${disabled} t5000-tar-tree.sh" |
151 |
+ disabled+=" t5000-tar-tree.sh" |
152 |
fi |
153 |
|
154 |
cvs=0 |
155 |
@@ -612,10 +612,10 @@ src_test() { |
156 |
if [[ $cvs -eq 1 ]]; then |
157 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
158 |
ewarn "You should retest with FEATURES=userpriv!" |
159 |
- disabled="${disabled} ${tests_cvs}" |
160 |
+ disabled+=" ${tests_cvs}" |
161 |
fi |
162 |
einfo "Skipping other tests that require being non-root" |
163 |
- disabled="${disabled} ${tests_nonroot}" |
164 |
+ disabled+=" ${tests_nonroot}" |
165 |
else |
166 |
[[ $cvs -gt 0 ]] && \ |
167 |
has_version dev-vcs/cvs && \ |
168 |
@@ -625,17 +625,17 @@ src_test() { |
169 |
let cvs=$cvs+1 |
170 |
if [[ $cvs -lt 3 ]]; then |
171 |
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
172 |
- disabled="${disabled} ${tests_cvs}" |
173 |
+ disabled+=" ${tests_cvs}" |
174 |
fi |
175 |
fi |
176 |
|
177 |
if ! use perl ; then |
178 |
einfo "Disabling tests that need Perl" |
179 |
- disabled="${disabled} ${tests_perl}" |
180 |
+ disabled+=" ${tests_perl}" |
181 |
fi |
182 |
|
183 |
einfo "Disabling tests that fail with SVN 1.7" |
184 |
- disabled="${disabled} ${test_svn}" |
185 |
+ disabled+=" ${test_svn}" |
186 |
|
187 |
# Reset all previously disabled tests |
188 |
cd "${S}/t" |
189 |
|
190 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
191 |
index 67a7f811554..e9f0c242bcf 100644 |
192 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
193 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
194 |
@@ -572,7 +572,7 @@ src_install() { |
195 |
} |
196 |
|
197 |
src_test() { |
198 |
- local disabled="t9128-git-svn-cmd-branch.sh" |
199 |
+ local disabled="" |
200 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
201 |
t9400-git-cvsserver-server.sh \ |
202 |
t9401-git-cvsserver-crlf.sh \ |
203 |
@@ -603,7 +603,7 @@ src_test() { |
204 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
205 |
if ! has_version app-arch/unzip ; then |
206 |
einfo "Disabling tar-tree tests" |
207 |
- disabled="${disabled} t5000-tar-tree.sh" |
208 |
+ disabled+=" t5000-tar-tree.sh" |
209 |
fi |
210 |
|
211 |
cvs=0 |
212 |
@@ -612,10 +612,10 @@ src_test() { |
213 |
if [[ $cvs -eq 1 ]]; then |
214 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
215 |
ewarn "You should retest with FEATURES=userpriv!" |
216 |
- disabled="${disabled} ${tests_cvs}" |
217 |
+ disabled+=" ${tests_cvs}" |
218 |
fi |
219 |
einfo "Skipping other tests that require being non-root" |
220 |
- disabled="${disabled} ${tests_nonroot}" |
221 |
+ disabled+=" ${tests_nonroot}" |
222 |
else |
223 |
[[ $cvs -gt 0 ]] && \ |
224 |
has_version dev-vcs/cvs && \ |
225 |
@@ -625,17 +625,17 @@ src_test() { |
226 |
let cvs=$cvs+1 |
227 |
if [[ $cvs -lt 3 ]]; then |
228 |
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
229 |
- disabled="${disabled} ${tests_cvs}" |
230 |
+ disabled+=" ${tests_cvs}" |
231 |
fi |
232 |
fi |
233 |
|
234 |
if ! use perl ; then |
235 |
einfo "Disabling tests that need Perl" |
236 |
- disabled="${disabled} ${tests_perl}" |
237 |
+ disabled+=" ${tests_perl}" |
238 |
fi |
239 |
|
240 |
einfo "Disabling tests that fail with SVN 1.7" |
241 |
- disabled="${disabled} ${test_svn}" |
242 |
+ disabled+=" ${test_svn}" |
243 |
|
244 |
# Reset all previously disabled tests |
245 |
cd "${S}/t" |
246 |
|
247 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
248 |
index 67a7f811554..e9f0c242bcf 100644 |
249 |
--- a/dev-vcs/git/git-9999.ebuild |
250 |
+++ b/dev-vcs/git/git-9999.ebuild |
251 |
@@ -572,7 +572,7 @@ src_install() { |
252 |
} |
253 |
|
254 |
src_test() { |
255 |
- local disabled="t9128-git-svn-cmd-branch.sh" |
256 |
+ local disabled="" |
257 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
258 |
t9400-git-cvsserver-server.sh \ |
259 |
t9401-git-cvsserver-crlf.sh \ |
260 |
@@ -603,7 +603,7 @@ src_test() { |
261 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
262 |
if ! has_version app-arch/unzip ; then |
263 |
einfo "Disabling tar-tree tests" |
264 |
- disabled="${disabled} t5000-tar-tree.sh" |
265 |
+ disabled+=" t5000-tar-tree.sh" |
266 |
fi |
267 |
|
268 |
cvs=0 |
269 |
@@ -612,10 +612,10 @@ src_test() { |
270 |
if [[ $cvs -eq 1 ]]; then |
271 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
272 |
ewarn "You should retest with FEATURES=userpriv!" |
273 |
- disabled="${disabled} ${tests_cvs}" |
274 |
+ disabled+=" ${tests_cvs}" |
275 |
fi |
276 |
einfo "Skipping other tests that require being non-root" |
277 |
- disabled="${disabled} ${tests_nonroot}" |
278 |
+ disabled+=" ${tests_nonroot}" |
279 |
else |
280 |
[[ $cvs -gt 0 ]] && \ |
281 |
has_version dev-vcs/cvs && \ |
282 |
@@ -625,17 +625,17 @@ src_test() { |
283 |
let cvs=$cvs+1 |
284 |
if [[ $cvs -lt 3 ]]; then |
285 |
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
286 |
- disabled="${disabled} ${tests_cvs}" |
287 |
+ disabled+=" ${tests_cvs}" |
288 |
fi |
289 |
fi |
290 |
|
291 |
if ! use perl ; then |
292 |
einfo "Disabling tests that need Perl" |
293 |
- disabled="${disabled} ${tests_perl}" |
294 |
+ disabled+=" ${tests_perl}" |
295 |
fi |
296 |
|
297 |
einfo "Disabling tests that fail with SVN 1.7" |
298 |
- disabled="${disabled} ${test_svn}" |
299 |
+ disabled+=" ${test_svn}" |
300 |
|
301 |
# Reset all previously disabled tests |
302 |
cd "${S}/t" |