Merge lp:~zyga/checkbox/piglit-guacamole into lp:checkbox
- piglit-guacamole
- Merge into trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~zyga/checkbox/piglit-guacamole |
Merge into: | lp:checkbox |
Diff against target: |
1077 lines (+351/-279) 6 files modified
providers/plainbox-provider-piglit/bin/piglit-archiver (+65/-39) providers/plainbox-provider-piglit/bin/piglit-combiner (+56/-37) providers/plainbox-provider-piglit/bin/piglit-wrapper (+62/-42) providers/plainbox-provider-piglit/po/pl.po (+83/-83) providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot (+70/-78) providers/plainbox-provider-piglit/units/piglit.pxu (+15/-0) |
To merge this branch: | bzr merge lp:~zyga/checkbox/piglit-guacamole |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Manrique (community) | Needs Fixing | ||
Review via email: mp+257077@code.launchpad.net |
Commit message
Description of the change
Hey. I'm looking for feedback on guacamolization of the trivial piglit provider that has three commands. Have a look.
cc9bc98 providers:piglit: add packaging meta-data
0be339c providers:piglit: correct logger namespace for piglit-archiver
2299697 providers:piglit: add dependency on guacamole
1e2c4e3 providers:piglit: convert piglit-archiver to use guacamole
616643c providers:piglit: convert piglit-combiner to use guacamole
449fcdd providers:piglit: convert piglit-wrapper to use guacamole
bd47529 providers:piglit: refresh translation template
dbc56ad providers:piglit: update Polish translations
One of the things I didn't do (feedback welcome) is to combine all three scripts together (easier code reuse). It's pretty easy with guacamole but I didn't take that step. Tell me what you think.
Zygmunt Krynicki (zyga) wrote : | # |
Thanks for having a look.
I may have made a mistake in the archive command, I just automatically
ripped the main code in two to get stuff into a Command class.
For reference, guacamole is now in the checkbox-dev PPA so you can
just apt-get install it from there.
As for the code size I think it's actually the opposite. All of the
stuff we have in clitools in plainbox today finds its way into
guacamole. All of the stock setup, teardown, logging, debugging, i18n,
man pages, etc. This gives consistent experience in all the little
scripts (and hopefully makes them better as some don't even respect
--help today). The goal with guacamole is to provide consistent,
high-quality base for command line apps. Code size can only increase
if the original application didn't care about many of those things
(and the piglit provider was actually written semi-sloppily, expecting
to be converted to guacamole later as a guinea pig). This also
explains why it's being done. It's one of the smallest (or the
smallest) self-contained codebase that can be experimented on.
It is definitely a preparation for the future, both in figuring out
API quirks in guacamole now and in missing features that I didn't
notice while coding it.
I'll look at the piglit-archiver issue and post a follow-up shortly.
Thanks
ZK
On Wed, Apr 22, 2015 at 6:54 PM, Daniel Manrique
<email address hidden> wrote:
> Review: Needs Fixing
>
> Something's wrong with the guacamolized version :(
>
> e.g. the archiver command should do something like this:
>
> $ providers/
> piglit-
> Archive with summary of piglit results is available in
> /src/checkbox/
>
> I installed guacamole in an active venv:
>
> $ pip list
> guacamole (0.8)
> pip (1.5.4)
> setuptools (2.2)
>
> Calling the guacamolized piglit-archiver says this:
>
> $ providers/
> usage: piglit-archiver [-h]
> piglit-archiver: error: unrecognized arguments: -n
>
> Maybe the piglit provider doesn't benefit much from guacamole? it doesn't seem to (yet) use any of the fancy features and looking at the code it essentially does the same (but with more code - that's what jumps to me but I realize that "it's actually more code" is not the best way to judge a refactoring).
>
> I wonder if this is preparation for the future, in which case it would be OK to me (we just need to fix the problem I showed above).
> --
> https:/
> You are the owner of lp:~zyga/checkbox/piglit-guacamole.
Unmerged revisions
- 3725. By Zygmunt Krynicki
-
providers:piglit: update Polish translations
Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3724. By Zygmunt Krynicki
-
providers:piglit: refresh translation template
Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3723. By Zygmunt Krynicki
-
providers:piglit: convert piglit-wrapper to use guacamole
This patch converts the big main() function to the WrapperCommand
class. This class has separate methods for describing command line
arguments and for doing its business. Guacamole provides the common glue
(and common features for debugging, logging, i18n and all the things).As before, there's one more class that has common functionality that
cannot be shared just yet.Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3722. By Zygmunt Krynicki
-
providers:piglit: convert piglit-combiner to use guacamole
This patch converts the big main() function to the CombinerCommand
class. This class has separate methods for describing command line
arguments and for doing its business. Guacamole provides the common glue
(and common features for debugging, logging, i18n and all the things).As before, there's one more class that has common functionality that
cannot be shared just yet.Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3721. By Zygmunt Krynicki
-
providers:piglit: convert piglit-archiver to use guacamole
This patch converts the big main() function to the ArchiverCommand
class. This class has separate methods for describing command line
arguments and for doing its business. Guacamole provides the common
glue (and common features for debugging, logging, i18n and all the
things).I also split off one more class that handles i18n specific to plainbox.
This class can be shared later.Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3720. By Zygmunt Krynicki
-
providers:piglit: add dependency on guacamole
Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3719. By Zygmunt Krynicki
-
providers:piglit: correct logger namespace for piglit-archiver
Signed-off-by: Zygmunt Krynicki <email address hidden>
- 3718. By Zygmunt Krynicki
-
providers:piglit: add packaging meta-data
Signed-off-by: Zygmunt Krynicki <email address hidden>
Preview Diff
1 | === modified file 'providers/plainbox-provider-piglit/bin/piglit-archiver' |
2 | --- providers/plainbox-provider-piglit/bin/piglit-archiver 2015-03-24 14:51:33 +0000 |
3 | +++ providers/plainbox-provider-piglit/bin/piglit-archiver 2015-04-22 13:03:51 +0000 |
4 | @@ -17,52 +17,78 @@ |
5 | # You should have received a copy of the GNU General Public License |
6 | # along with Checkbox. If not, see <http://www.gnu.org/licenses/>. |
7 | """ Tool for archiving piglit report. """ |
8 | -import argparse |
9 | import gettext |
10 | import logging |
11 | import os |
12 | import shutil |
13 | -import sys |
14 | + |
15 | +from guacamole import Command |
16 | |
17 | _ = gettext.gettext |
18 | |
19 | -_logger = logging.getLogger("piglit-combiner") |
20 | - |
21 | - |
22 | -def main(): |
23 | - """ Main function. """ |
24 | - gettext.textdomain('plainbox-provider-piglit') |
25 | - gettext.bindtextdomain('plainbox-provider-piglit', |
26 | - os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR')) |
27 | - parser = argparse.ArgumentParser( |
28 | - description=_("Tool for archiving piglit report")) |
29 | - parser.add_argument( |
30 | - '-n', '--base-name', required=True, |
31 | - help=_("base name of the archive")) |
32 | - parser.add_argument( |
33 | - '-f', '--format', choices=['zip', 'tar', 'gztar', 'bztar'], |
34 | - default='gztar', help=_("format of the archive to create")) |
35 | - parser.add_argument( |
36 | - '-r', '--root-dir', required=True, |
37 | - help=_("root directory of the archive")) |
38 | - parser.add_argument( |
39 | - '-b', '--base-dir', required=True, |
40 | - help=_("root directory of the archive")) |
41 | - parser.add_argument( |
42 | - "--verbose", "-v", |
43 | - action='store_true', |
44 | - help=_("be more verbose")) |
45 | - ns = parser.parse_args() |
46 | - logging.basicConfig( |
47 | - level=logging.INFO if ns.verbose else logging.WARNING, |
48 | - format="{name}:{levelname}: {message}", style='{') |
49 | - ns = parser.parse_args() |
50 | - name = shutil.make_archive( |
51 | - ns.base_name, ns.format, ns.root_dir, ns.base_dir, ns.verbose, |
52 | - logger=_logger) |
53 | - print(_("Archive with summary of piglit results is available in")) |
54 | - print(name) |
55 | +_logger = logging.getLogger("piglit-archiver") |
56 | + |
57 | + |
58 | +class ProviderCommand(Command): |
59 | + |
60 | + """Shared implementation of all provider-specific commands.""" |
61 | + |
62 | + def get_locale_dir(self): |
63 | + """ |
64 | + Discover alternate locale directory. |
65 | + |
66 | + This is an overridden guacamole method to take advantage of plainbox |
67 | + supplying locale directory to each provider via the |
68 | + ``PLAINBOX_PROVIDER_LOCALE_DIR``. |
69 | + """ |
70 | + return os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR') |
71 | + |
72 | + |
73 | +class ArchiverCommand(ProviderCommand): |
74 | + |
75 | + """ |
76 | + Tool for archiving piglit report. |
77 | + |
78 | + This tool can archive a HTML report generated by piglit. |
79 | + |
80 | + @EPILOG@ |
81 | + |
82 | + The base name is used to derive the name of the final archive. It can |
83 | + include the directory part. The root directory is the directory that |
84 | + becomes the root of the archive. The base directory is the directory to |
85 | + archive, relative to the root directory. The actual archive will contain |
86 | + the base directory. |
87 | + """ |
88 | + |
89 | + gettext_domain = 'plainbox-provider-piglit' |
90 | + |
91 | + def invoked(self, ctx): |
92 | + """Invoke the command.""" |
93 | + name = shutil.make_archive( |
94 | + ctx.args.base_name, ctx.args.format, ctx.args.root_dir, |
95 | + ctx.args.base_dir, ctx.args.verbose, logger=_logger) |
96 | + print(_("Archive with summary of piglit results is available in")) |
97 | + print(name) |
98 | + |
99 | + def register_arguments(self, parser): |
100 | + """Define command arguments.""" |
101 | + parser.add_argument( |
102 | + '-n', '--base-name', required=True, |
103 | + help=_("base name of the archive")) |
104 | + parser.add_argument( |
105 | + '-f', '--format', choices=['zip', 'tar', 'gztar', 'bztar'], |
106 | + default='gztar', help=_("format of the archive to create")) |
107 | + parser.add_argument( |
108 | + '-r', '--root-dir', required=True, |
109 | + help=_("root directory of the archive")) |
110 | + parser.add_argument( |
111 | + '-b', '--base-dir', required=True, |
112 | + help=_("base directory of the archive")) |
113 | + parser.add_argument( |
114 | + "--verbose", "-v", |
115 | + action='store_true', |
116 | + help=_("be more verbose")) |
117 | |
118 | |
119 | if __name__ == "__main__": |
120 | - sys.exit(main()) |
121 | + ArchiverCommand().main() |
122 | |
123 | === modified file 'providers/plainbox-provider-piglit/bin/piglit-combiner' |
124 | --- providers/plainbox-provider-piglit/bin/piglit-combiner 2015-03-24 14:51:33 +0000 |
125 | +++ providers/plainbox-provider-piglit/bin/piglit-combiner 2015-04-22 13:03:51 +0000 |
126 | @@ -27,12 +27,12 @@ |
127 | This script was written to work with ``piglit-0~git20150312-530724b-1`` and |
128 | may not work with older or more recent version. |
129 | """ |
130 | -import argparse |
131 | import gettext |
132 | import json |
133 | import logging |
134 | import os |
135 | -import sys |
136 | + |
137 | +from guacamole import Command |
138 | |
139 | _ = gettext.gettext |
140 | |
141 | @@ -159,41 +159,60 @@ |
142 | return old_value |
143 | |
144 | |
145 | -def main(): |
146 | - """ Main function. """ |
147 | - gettext.textdomain('plainbox-provider-piglit') |
148 | - gettext.bindtextdomain('plainbox-provider-piglit', |
149 | - os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR')) |
150 | - parser = argparse.ArgumentParser( |
151 | - description=_( |
152 | - "Tool for combining results of multiple runs of piglit" |
153 | - )) |
154 | - parser.add_argument( |
155 | - '-i', '--input-dir', metavar=_("DIR"), required=True, |
156 | - help=_("directory with results to load (recursively)")) |
157 | - parser.add_argument( |
158 | - "-o", "--output-dir", metavar=_("DIR"), required=True, |
159 | - help=_("directory to save results to")) |
160 | - parser.add_argument( |
161 | - "--verbose", "-v", |
162 | - action='store_true', |
163 | - help=_("be more verbose")) |
164 | - ns = parser.parse_args() |
165 | - logging.basicConfig( |
166 | - level=logging.INFO if ns.verbose else logging.WARNING, |
167 | - format="{name}:{levelname}: {message}", style='{') |
168 | - try: |
169 | - count = combine_piglit_results(ns.input_dir, ns.output_dir) |
170 | - except CombinationError as exc: |
171 | - _logger.error(_("Unable to combine results: %s"), exc) |
172 | - return 1 |
173 | - else: |
174 | - _logger.info(gettext.ngettext( |
175 | - "Combined %d result", "Combined %d results", count), count) |
176 | - if count == 0: |
177 | - _logger.warning(_("No results were really combined!")) |
178 | - return 2 |
179 | +class ProviderCommand(Command): |
180 | + |
181 | + """Shared implementation of all provider-specific commands.""" |
182 | + |
183 | + def get_locale_dir(self): |
184 | + """ |
185 | + Discover alternate locale directory. |
186 | + |
187 | + This is an overridden guacamole method to take advantage of plainbox |
188 | + supplying locale directory to each provider via the |
189 | + ``PLAINBOX_PROVIDER_LOCALE_DIR``. |
190 | + """ |
191 | + return os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR') |
192 | + |
193 | + |
194 | +class CombinerCommand(ProviderCommand): |
195 | + |
196 | + """ |
197 | + Tool for combining results of multiple runs of piglit. |
198 | + |
199 | + This tool can combine multiple runs of piglit into one result file. It is |
200 | + useful for preparing report from multiple separate test runs. |
201 | + """ |
202 | + |
203 | + gettext_domain = 'plainbox-provider-piglit' |
204 | + |
205 | + def invoked(self, ctx): |
206 | + """Invoke the command.""" |
207 | + try: |
208 | + count = combine_piglit_results( |
209 | + ctx.args.input_dir, ctx.args.output_dir) |
210 | + except CombinationError as exc: |
211 | + _logger.error(_("Unable to combine results: %s"), exc) |
212 | + return 1 |
213 | + else: |
214 | + _logger.info(gettext.ngettext( |
215 | + "Combined %d result", "Combined %d results", count), count) |
216 | + if count == 0: |
217 | + _logger.warning(_("No results were really combined!")) |
218 | + return 2 |
219 | + |
220 | + def register_arguments(self, parser): |
221 | + """Define command arguments.""" |
222 | + parser.add_argument( |
223 | + '-i', '--input-dir', metavar=_("DIR"), required=True, |
224 | + help=_("directory with results to load (recursively)")) |
225 | + parser.add_argument( |
226 | + "-o", "--output-dir", metavar=_("DIR"), required=True, |
227 | + help=_("directory to save results to")) |
228 | + parser.add_argument( |
229 | + "--verbose", "-v", |
230 | + action='store_true', |
231 | + help=_("be more verbose")) |
232 | |
233 | |
234 | if __name__ == "__main__": |
235 | - sys.exit(main()) |
236 | + CombinerCommand().main() |
237 | |
238 | === modified file 'providers/plainbox-provider-piglit/bin/piglit-wrapper' |
239 | --- providers/plainbox-provider-piglit/bin/piglit-wrapper 2015-03-24 14:51:33 +0000 |
240 | +++ providers/plainbox-provider-piglit/bin/piglit-wrapper 2015-04-22 13:03:51 +0000 |
241 | @@ -26,16 +26,16 @@ |
242 | This script was written to work with ``piglit-0~git20150312-530724b-1`` and |
243 | may not work with older or more recent version. |
244 | """ |
245 | -import argparse |
246 | import collections |
247 | import gettext |
248 | import json |
249 | import logging |
250 | import os |
251 | import subprocess |
252 | -import sys |
253 | import tempfile |
254 | |
255 | +from guacamole import Command |
256 | + |
257 | _ = gettext.gettext |
258 | |
259 | _logger = logging.getLogger("piglit-wrapper") |
260 | @@ -151,46 +151,66 @@ |
261 | self._outcome_list[outcome].append(test_id) |
262 | |
263 | |
264 | -def main(): |
265 | - """ Main function. """ |
266 | - gettext.textdomain('plainbox-provider-piglit') |
267 | - gettext.bindtextdomain('plainbox-provider-piglit', |
268 | - os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR')) |
269 | - parser = argparse.ArgumentParser( |
270 | - description=_("Tool for running piglit tests")) |
271 | - parser.add_argument( |
272 | - '-d', '--dirname', metavar=_("DIR"), default=None, |
273 | - help=_("save piglit results to DIR")) |
274 | - parser.add_argument( |
275 | - "--test", "-t", metavar=_("PATTERN"), required=True, action='append', |
276 | - help=_("run piglit tests matching given PATTERN")) |
277 | - parser.add_argument( |
278 | - "--verbose", "-v", |
279 | - action='store_true', |
280 | - help=_("be more verbose during testing")) |
281 | - ns = parser.parse_args() |
282 | - logging.basicConfig( |
283 | - level=logging.INFO if ns.verbose else logging.WARNING, |
284 | - format="{name}:{levelname}: {message}", style='{') |
285 | - piglit = PiglitWrapper(ns.test) |
286 | - piglit.run(ns.dirname) |
287 | - if not piglit.is_supported: |
288 | - print(_("This version of piglit is not supported")) |
289 | - return 2 |
290 | - stats = piglit.outcome_stats |
291 | - print(_("Summary of results (by outcome)")) |
292 | - for outcome in sorted(stats.keys()): |
293 | - print(" - {}: {}".format(outcome, stats[outcome])) |
294 | - if ns.verbose: |
295 | - for test_id in sorted(piglit.outcome_list[outcome]): |
296 | - print(" * {}".format(test_id)) |
297 | - if piglit.is_successful: |
298 | - print(_("Tests successful")) |
299 | - return 0 |
300 | - else: |
301 | - print(_("Tests unsuccessful")) |
302 | - return 1 |
303 | +class ProviderCommand(Command): |
304 | + |
305 | + """Shared implementation of all provider-specific commands.""" |
306 | + |
307 | + def get_locale_dir(self): |
308 | + """ |
309 | + Discover alternate locale directory. |
310 | + |
311 | + This is an overridden guacamole method to take advantage of plainbox |
312 | + supplying locale directory to each provider via the |
313 | + ``PLAINBOX_PROVIDER_LOCALE_DIR``. |
314 | + """ |
315 | + return os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR') |
316 | + |
317 | + |
318 | +class WrapperCommand(ProviderCommand): |
319 | + |
320 | + """ |
321 | + Tool for running piglit in a controlled way. |
322 | + |
323 | + |
324 | + Tool for running piglit tests. |
325 | + """ |
326 | + |
327 | + gettext_domain = 'plainbox-provider-piglit' |
328 | + |
329 | + def invoked(self, ctx): |
330 | + """Invoke the command.""" |
331 | + piglit = PiglitWrapper(ctx.args.test) |
332 | + piglit.run(ctx.args.dirname) |
333 | + if not piglit.is_supported: |
334 | + print(_("This version of piglit is not supported")) |
335 | + return 2 |
336 | + stats = piglit.outcome_stats |
337 | + print(_("Summary of results (by outcome)")) |
338 | + for outcome in sorted(stats.keys()): |
339 | + print(" - {}: {}".format(outcome, stats[outcome])) |
340 | + if ctx.args.verbose: |
341 | + for test_id in sorted(piglit.outcome_list[outcome]): |
342 | + print(" * {}".format(test_id)) |
343 | + if piglit.is_successful: |
344 | + print(_("Tests successful")) |
345 | + return 0 |
346 | + else: |
347 | + print(_("Tests unsuccessful")) |
348 | + return 1 |
349 | + |
350 | + def register_arguments(self, parser): |
351 | + """Define command arguments.""" |
352 | + parser.add_argument( |
353 | + '-d', '--dirname', metavar=_("DIR"), default=None, |
354 | + help=_("save piglit results to DIR")) |
355 | + parser.add_argument( |
356 | + "--test", "-t", metavar=_("PATTERN"), required=True, |
357 | + action='append', help=_("run piglit tests matching given PATTERN")) |
358 | + parser.add_argument( |
359 | + "--verbose", "-v", |
360 | + action='store_true', |
361 | + help=_("be more verbose during testing")) |
362 | |
363 | |
364 | if __name__ == "__main__": |
365 | - sys.exit(main()) |
366 | + WrapperCommand().main() |
367 | |
368 | === modified file 'providers/plainbox-provider-piglit/po/pl.po' |
369 | --- providers/plainbox-provider-piglit/po/pl.po 2015-04-18 05:08:45 +0000 |
370 | +++ providers/plainbox-provider-piglit/po/pl.po 2015-04-22 13:03:51 +0000 |
371 | @@ -7,10 +7,11 @@ |
372 | msgstr "" |
373 | "Project-Id-Version: plainbox-provider-piglit 0.1\n" |
374 | "Report-Msgid-Bugs-To: \n" |
375 | -"POT-Creation-Date: 2015-04-08 19:15+0200\n" |
376 | +"POT-Creation-Date: 2015-04-22 14:53+0200\n" |
377 | "PO-Revision-Date: 2015-04-09 00:01+0000\n" |
378 | "Last-Translator: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>\n" |
379 | "Language-Team: polski <>\n" |
380 | +"Language: Polish\n" |
381 | "MIME-Version: 1.0\n" |
382 | "Content-Type: text/plain; charset=UTF-8\n" |
383 | "Content-Transfer-Encoding: 8bit\n" |
384 | @@ -18,15 +19,14 @@ |
385 | "|| n%100>=20) ? 1 : 2;\n" |
386 | "X-Launchpad-Export-Date: 2015-04-18 05:08+0000\n" |
387 | "X-Generator: Launchpad (build 17430)\n" |
388 | -"Language: Polish\n" |
389 | |
390 | #. summary |
391 | -#: ../units/piglit.pxu:4 |
392 | +#: ../units/piglit.pxu:19 |
393 | msgid "Run piglit tests for Frame Buffer Object (FBO) operations" |
394 | msgstr "Uruchom testy programu Piglit dla operacji na buforach ramki (FBO)" |
395 | |
396 | #. description |
397 | -#: ../units/piglit.pxu:5 |
398 | +#: ../units/piglit.pxu:20 |
399 | msgid "" |
400 | "This job runs piglit tests for checking support for frame buffer object " |
401 | "operations, depth buffer and stencil buffer." |
402 | @@ -36,25 +36,24 @@ |
403 | "buforach szablonowych." |
404 | |
405 | #. summary |
406 | -#: ../units/piglit.pxu:21 |
407 | +#: ../units/piglit.pxu:36 |
408 | msgid "Run piglit tests for OpenGL 2.1" |
409 | msgstr "Uruchom testy programu Piglit dla OpenGL 2.1" |
410 | |
411 | #. description |
412 | -#: ../units/piglit.pxu:22 |
413 | +#: ../units/piglit.pxu:37 |
414 | msgid "This job runs piglit tests for checking OpenGL 2.1 support." |
415 | msgstr "" |
416 | "To zadanie uruchamia testy programu Piglit sprawdzające wsparcie dla OpenGL " |
417 | "2.1." |
418 | |
419 | #. summary |
420 | -#: ../units/piglit.pxu:37 |
421 | +#: ../units/piglit.pxu:52 |
422 | msgid "Run piglit tests for Vertex Buffer Object (VBO) operations" |
423 | -msgstr "" |
424 | -"Uruchom testy programu Piglit dla operacji na buforach geometrii (VBO)" |
425 | +msgstr "Uruchom testy programu Piglit dla operacji na buforach geometrii (VBO)" |
426 | |
427 | #. description |
428 | -#: ../units/piglit.pxu:38 |
429 | +#: ../units/piglit.pxu:53 |
430 | msgid "" |
431 | "This job runs piglit tests for checking support for vertex buffer object " |
432 | "operations." |
433 | @@ -63,12 +62,12 @@ |
434 | "geometrii." |
435 | |
436 | #. summary |
437 | -#: ../units/piglit.pxu:54 |
438 | +#: ../units/piglit.pxu:69 |
439 | msgid "Run piglit tests for GLSL fragment shader operations" |
440 | msgstr "Uruchom testy programu Piglit dla operacji GLSL cieniowania pikseli" |
441 | |
442 | #. description |
443 | -#: ../units/piglit.pxu:55 |
444 | +#: ../units/piglit.pxu:70 |
445 | msgid "" |
446 | "This job runs piglit tests for checking support for GLSL fragment shader " |
447 | "operations." |
448 | @@ -77,13 +76,13 @@ |
449 | "cieniowania pikseli GLSL." |
450 | |
451 | #. summary |
452 | -#: ../units/piglit.pxu:71 |
453 | +#: ../units/piglit.pxu:86 |
454 | msgid "Run piglit tests for GLSL vertex shader operations" |
455 | msgstr "" |
456 | "Uruchom testy programu Piglit dla operacji GLSL cieniowania wierzchołków" |
457 | |
458 | #. description |
459 | -#: ../units/piglit.pxu:72 |
460 | +#: ../units/piglit.pxu:87 |
461 | msgid "" |
462 | "This job runs piglit tests for checking support for GLSL vertex shader " |
463 | "operations." |
464 | @@ -92,12 +91,12 @@ |
465 | "cieniowania wierzchołków GLSL." |
466 | |
467 | #. summary |
468 | -#: ../units/piglit.pxu:90 |
469 | +#: ../units/piglit.pxu:105 |
470 | msgid "Run piglit tests for texture-from-pixmap extension" |
471 | msgstr "Uruchom testy programu Piglit dla rozszerzenia tekstura-z-piksmapy" |
472 | |
473 | #. description |
474 | -#: ../units/piglit.pxu:91 |
475 | +#: ../units/piglit.pxu:106 |
476 | msgid "" |
477 | "This job runs piglit tests for checking support for texture from pixmap." |
478 | msgstr "" |
479 | @@ -105,12 +104,12 @@ |
480 | "rozszerzenia tekstura-z-piksmapy." |
481 | |
482 | #. summary |
483 | -#: ../units/piglit.pxu:106 |
484 | +#: ../units/piglit.pxu:121 |
485 | msgid "Run piglit tests for stencil buffer operations" |
486 | msgstr "Uruchom testy programu Piglit dla operacji na buforach szablonowych" |
487 | |
488 | #. description |
489 | -#: ../units/piglit.pxu:107 |
490 | +#: ../units/piglit.pxu:122 |
491 | msgid "" |
492 | "This job runs piglit tests for checking support for stencil buffer " |
493 | "operations." |
494 | @@ -119,12 +118,12 @@ |
495 | "buforach szablonowych." |
496 | |
497 | #. summary |
498 | -#: ../units/piglit.pxu:123 |
499 | +#: ../units/piglit.pxu:138 |
500 | msgid "Combine all piglit test results into one" |
501 | msgstr "Połącz wszystkie wyniki testów programu Piglit w jeden" |
502 | |
503 | #. description |
504 | -#: ../units/piglit.pxu:124 |
505 | +#: ../units/piglit.pxu:139 |
506 | msgid "" |
507 | "This job combines all of the prior piglit results into one result file so " |
508 | "that they can be analyzed together. It is required to use piglit's built-in " |
509 | @@ -135,12 +134,12 @@ |
510 | "użycia generatora raportów programu Piglit." |
511 | |
512 | #. summary |
513 | -#: ../units/piglit.pxu:140 |
514 | +#: ../units/piglit.pxu:155 |
515 | msgid "Create a HTML summary of all the piglit test results" |
516 | msgstr "Utwórz HTML'owe podsumowanie wyników testów programu Piglit" |
517 | |
518 | #. description |
519 | -#: ../units/piglit.pxu:141 |
520 | +#: ../units/piglit.pxu:156 |
521 | msgid "" |
522 | "This job runs the piglit HTML report generator on the combination of all the " |
523 | "past results." |
524 | @@ -149,12 +148,12 @@ |
525 | "wynikach wszystkich testów." |
526 | |
527 | #. summary |
528 | -#: ../units/piglit.pxu:159 |
529 | +#: ../units/piglit.pxu:174 |
530 | msgid "Archive HTML summary of all piglit test results" |
531 | msgstr "Zarchiwizuj HTML'owe podsumowanie wyników testów programu Piglit" |
532 | |
533 | #. description |
534 | -#: ../units/piglit.pxu:160 |
535 | +#: ../units/piglit.pxu:175 |
536 | msgid "" |
537 | "This job archives the HTML summary of all the piglit results for convenient " |
538 | "access. The result is not added as plainbox system attachment attachment but " |
539 | @@ -165,12 +164,12 @@ |
540 | "plainbox, może być jednak skopiowany z katalogu sesji." |
541 | |
542 | #. name |
543 | -#: ../units/piglit.pxu:177 |
544 | +#: ../units/piglit.pxu:192 |
545 | msgid "Select piglit tests" |
546 | msgstr "Wybrane testy programu Piglit" |
547 | |
548 | #. description |
549 | -#: ../units/piglit.pxu:178 |
550 | +#: ../units/piglit.pxu:193 |
551 | msgid "" |
552 | "This test plan runs a selection of piglit tests, summarizes them and creates " |
553 | "an archive for easy inspection and sharing." |
554 | @@ -179,7 +178,7 @@ |
555 | "oraz archiwum które ułatwia analizę oraz współdzielenie danych." |
556 | |
557 | #. description |
558 | -#: ../units/piglit.pxu:190 |
559 | +#: ../units/piglit.pxu:205 |
560 | msgid "Piglit Tests" |
561 | msgstr "Testy programu Piglit" |
562 | |
563 | @@ -209,47 +208,43 @@ |
564 | msgid "Analyzing piglit test results (format 4)" |
565 | msgstr "Analizowanie wyników testów programu Piglit (format 4)" |
566 | |
567 | -#: ../bin/piglit-wrapper:160 |
568 | -msgid "Tool for running piglit tests" |
569 | -msgstr "Narzędzie do uruchamiania testów programu Piglit" |
570 | - |
571 | -#: ../bin/piglit-wrapper:162 ../bin/piglit-combiner:172 |
572 | -#: ../bin/piglit-combiner:175 |
573 | +#: ../bin/piglit-wrapper:185 |
574 | +msgid "This version of piglit is not supported" |
575 | +msgstr "Ta wersja programu Piglit nie jest wspierana" |
576 | + |
577 | +#: ../bin/piglit-wrapper:188 |
578 | +msgid "Summary of results (by outcome)" |
579 | +msgstr "Podsumowanie wyników (wedle statusu)" |
580 | + |
581 | +#: ../bin/piglit-wrapper:195 |
582 | +msgid "Tests successful" |
583 | +msgstr "Test zakończony powodzeniem" |
584 | + |
585 | +#: ../bin/piglit-wrapper:198 |
586 | +msgid "Tests unsuccessful" |
587 | +msgstr "Test zakończony niepowodzeniem" |
588 | + |
589 | +#: ../bin/piglit-wrapper:204 ../bin/piglit-combiner:206 |
590 | +#: ../bin/piglit-combiner:209 |
591 | msgid "DIR" |
592 | msgstr "KATALOG" |
593 | |
594 | -#: ../bin/piglit-wrapper:163 |
595 | +#: ../bin/piglit-wrapper:205 |
596 | msgid "save piglit results to DIR" |
597 | msgstr "zapisz wyniki testów programu Piglit do KATALOGU" |
598 | |
599 | -#: ../bin/piglit-wrapper:165 |
600 | +#: ../bin/piglit-wrapper:207 |
601 | msgid "PATTERN" |
602 | msgstr "WZORZEC" |
603 | |
604 | -#: ../bin/piglit-wrapper:166 |
605 | +#: ../bin/piglit-wrapper:208 |
606 | msgid "run piglit tests matching given PATTERN" |
607 | msgstr "uruchom testy programu Piglit pasujące do WZORCA" |
608 | |
609 | -#: ../bin/piglit-wrapper:170 |
610 | +#: ../bin/piglit-wrapper:212 |
611 | msgid "be more verbose during testing" |
612 | msgstr "bądź bardziej wygadany podczas testowania" |
613 | |
614 | -#: ../bin/piglit-wrapper:178 |
615 | -msgid "This version of piglit is not supported" |
616 | -msgstr "Ta wersja programu Piglit nie jest wspierana" |
617 | - |
618 | -#: ../bin/piglit-wrapper:181 |
619 | -msgid "Summary of results (by outcome)" |
620 | -msgstr "Podsumowanie wyników (wedle statusu)" |
621 | - |
622 | -#: ../bin/piglit-wrapper:188 |
623 | -msgid "Tests successful" |
624 | -msgstr "Test zakończony powodzeniem" |
625 | - |
626 | -#: ../bin/piglit-wrapper:191 |
627 | -msgid "Tests unsuccessful" |
628 | -msgstr "Test zakończony niepowodzeniem" |
629 | - |
630 | #: ../bin/piglit-combiner:44 |
631 | msgid "Discovering all results in directory: %r" |
632 | msgstr "Odnajdywanie wszystkich wyników w katalogu: %r" |
633 | @@ -270,29 +265,12 @@ |
634 | msgid "Combination function failed for: {!r}" |
635 | msgstr "Funkcja łącząca zawiodła dla: {!r}" |
636 | |
637 | -#: ../bin/piglit-combiner:169 |
638 | -msgid "Tool for combining results of multiple runs of piglit" |
639 | -msgstr "" |
640 | -"Narzędzie do łączenia wyników wielokrotnych uruchomień programu Piglit" |
641 | - |
642 | -#: ../bin/piglit-combiner:173 |
643 | -msgid "directory with results to load (recursively)" |
644 | -msgstr "katalog z którego wczytać wyniki (rekurencyjne)" |
645 | - |
646 | -#: ../bin/piglit-combiner:176 |
647 | -msgid "directory to save results to" |
648 | -msgstr "katalog do zapisania wyników" |
649 | - |
650 | -#: ../bin/piglit-combiner:180 ../bin/piglit-archiver:54 |
651 | -msgid "be more verbose" |
652 | -msgstr "bądź bardziej wymowny" |
653 | - |
654 | -#: ../bin/piglit-combiner:188 |
655 | +#: ../bin/piglit-combiner:194 |
656 | #, c-format |
657 | msgid "Unable to combine results: %s" |
658 | msgstr "Nie można połączyć wyników: %s" |
659 | |
660 | -#: ../bin/piglit-combiner:192 |
661 | +#: ../bin/piglit-combiner:198 |
662 | #, c-format |
663 | msgid "Combined %d result" |
664 | msgid_plural "Combined %d results" |
665 | @@ -300,30 +278,52 @@ |
666 | msgstr[1] "Połączono %d wyniki" |
667 | msgstr[2] "Połączono %d wyników" |
668 | |
669 | -#: ../bin/piglit-combiner:194 |
670 | +#: ../bin/piglit-combiner:200 |
671 | msgid "No results were really combined!" |
672 | msgstr "Tak na prawdę to nie połączono żadnych wyników!" |
673 | |
674 | -#: ../bin/piglit-archiver:38 |
675 | -msgid "Tool for archiving piglit report" |
676 | -msgstr "Narzędzie do archiwizacji raportu programu Piglit" |
677 | - |
678 | -#: ../bin/piglit-archiver:41 |
679 | +#: ../bin/piglit-combiner:207 |
680 | +msgid "directory with results to load (recursively)" |
681 | +msgstr "katalog z którego wczytać wyniki (rekurencyjne)" |
682 | + |
683 | +#: ../bin/piglit-combiner:210 |
684 | +msgid "directory to save results to" |
685 | +msgstr "katalog do zapisania wyników" |
686 | + |
687 | +#: ../bin/piglit-combiner:214 ../bin/piglit-archiver:90 |
688 | +msgid "be more verbose" |
689 | +msgstr "bądź bardziej wymowny" |
690 | + |
691 | +#: ../bin/piglit-archiver:70 |
692 | +msgid "Archive with summary of piglit results is available in" |
693 | +msgstr "Archiwum z podsumowaniem wyników programu Piglit jest dostępne w" |
694 | + |
695 | +#: ../bin/piglit-archiver:77 |
696 | msgid "base name of the archive" |
697 | msgstr "nazwa bazowa archiwum" |
698 | |
699 | -#: ../bin/piglit-archiver:44 |
700 | +#: ../bin/piglit-archiver:80 |
701 | msgid "format of the archive to create" |
702 | msgstr "format archiwum do utworzenia" |
703 | |
704 | -#: ../bin/piglit-archiver:47 ../bin/piglit-archiver:50 |
705 | +#: ../bin/piglit-archiver:83 |
706 | msgid "root directory of the archive" |
707 | msgstr "główny katalog archiwum" |
708 | |
709 | -#: ../bin/piglit-archiver:63 |
710 | -msgid "Archive with summary of piglit results is available in" |
711 | -msgstr "Archiwum z podsumowaniem wyników programu Piglit jest dostępne w" |
712 | +#: ../bin/piglit-archiver:86 |
713 | +msgid "base directory of the archive" |
714 | +msgstr "bazowy katalog archiwum" |
715 | |
716 | #: ../manage.py:25 |
717 | msgid "Piglit (OpenGL/OpenCL) Test Provider" |
718 | msgstr "Dostawca testów Piglit (OpenGL/OpenCL)" |
719 | + |
720 | +#~ msgid "Tool for running piglit tests" |
721 | +#~ msgstr "Narzędzie do uruchamiania testów programu Piglit" |
722 | + |
723 | +#~ msgid "Tool for combining results of multiple runs of piglit" |
724 | +#~ msgstr "" |
725 | +#~ "Narzędzie do łączenia wyników wielokrotnych uruchomień programu Piglit" |
726 | + |
727 | +#~ msgid "Tool for archiving piglit report" |
728 | +#~ msgstr "Narzędzie do archiwizacji raportu programu Piglit" |
729 | |
730 | === modified file 'providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot' |
731 | --- providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot 2015-04-08 17:16:41 +0000 |
732 | +++ providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot 2015-04-22 13:03:51 +0000 |
733 | @@ -8,7 +8,7 @@ |
734 | msgstr "" |
735 | "Project-Id-Version: PACKAGE VERSION\n" |
736 | "Report-Msgid-Bugs-To: \n" |
737 | -"POT-Creation-Date: 2015-04-08 19:15+0200\n" |
738 | +"POT-Creation-Date: 2015-04-22 14:53+0200\n" |
739 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
740 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
741 | "Language-Team: LANGUAGE <LL@li.org>\n" |
742 | @@ -19,93 +19,93 @@ |
743 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
744 | |
745 | #. summary |
746 | -#: ../units/piglit.pxu:4 |
747 | +#: ../units/piglit.pxu:19 |
748 | msgid "Run piglit tests for Frame Buffer Object (FBO) operations" |
749 | msgstr "" |
750 | |
751 | #. description |
752 | -#: ../units/piglit.pxu:5 |
753 | +#: ../units/piglit.pxu:20 |
754 | msgid "" |
755 | "This job runs piglit tests for checking support for frame buffer object " |
756 | "operations, depth buffer and stencil buffer." |
757 | msgstr "" |
758 | |
759 | #. summary |
760 | -#: ../units/piglit.pxu:21 |
761 | +#: ../units/piglit.pxu:36 |
762 | msgid "Run piglit tests for OpenGL 2.1" |
763 | msgstr "" |
764 | |
765 | #. description |
766 | -#: ../units/piglit.pxu:22 |
767 | +#: ../units/piglit.pxu:37 |
768 | msgid "This job runs piglit tests for checking OpenGL 2.1 support." |
769 | msgstr "" |
770 | |
771 | #. summary |
772 | -#: ../units/piglit.pxu:37 |
773 | +#: ../units/piglit.pxu:52 |
774 | msgid "Run piglit tests for Vertex Buffer Object (VBO) operations" |
775 | msgstr "" |
776 | |
777 | #. description |
778 | -#: ../units/piglit.pxu:38 |
779 | +#: ../units/piglit.pxu:53 |
780 | msgid "" |
781 | "This job runs piglit tests for checking support for vertex buffer object " |
782 | "operations." |
783 | msgstr "" |
784 | |
785 | #. summary |
786 | -#: ../units/piglit.pxu:54 |
787 | +#: ../units/piglit.pxu:69 |
788 | msgid "Run piglit tests for GLSL fragment shader operations" |
789 | msgstr "" |
790 | |
791 | #. description |
792 | -#: ../units/piglit.pxu:55 |
793 | +#: ../units/piglit.pxu:70 |
794 | msgid "" |
795 | "This job runs piglit tests for checking support for GLSL fragment shader " |
796 | "operations." |
797 | msgstr "" |
798 | |
799 | #. summary |
800 | -#: ../units/piglit.pxu:71 |
801 | +#: ../units/piglit.pxu:86 |
802 | msgid "Run piglit tests for GLSL vertex shader operations" |
803 | msgstr "" |
804 | |
805 | #. description |
806 | -#: ../units/piglit.pxu:72 |
807 | +#: ../units/piglit.pxu:87 |
808 | msgid "" |
809 | "This job runs piglit tests for checking support for GLSL vertex shader " |
810 | "operations." |
811 | msgstr "" |
812 | |
813 | #. summary |
814 | -#: ../units/piglit.pxu:90 |
815 | +#: ../units/piglit.pxu:105 |
816 | msgid "Run piglit tests for texture-from-pixmap extension" |
817 | msgstr "" |
818 | |
819 | #. description |
820 | -#: ../units/piglit.pxu:91 |
821 | +#: ../units/piglit.pxu:106 |
822 | msgid "" |
823 | "This job runs piglit tests for checking support for texture from pixmap." |
824 | msgstr "" |
825 | |
826 | #. summary |
827 | -#: ../units/piglit.pxu:106 |
828 | +#: ../units/piglit.pxu:121 |
829 | msgid "Run piglit tests for stencil buffer operations" |
830 | msgstr "" |
831 | |
832 | #. description |
833 | -#: ../units/piglit.pxu:107 |
834 | +#: ../units/piglit.pxu:122 |
835 | msgid "" |
836 | "This job runs piglit tests for checking support for stencil buffer " |
837 | "operations." |
838 | msgstr "" |
839 | |
840 | #. summary |
841 | -#: ../units/piglit.pxu:123 |
842 | +#: ../units/piglit.pxu:138 |
843 | msgid "Combine all piglit test results into one" |
844 | msgstr "" |
845 | |
846 | #. description |
847 | -#: ../units/piglit.pxu:124 |
848 | +#: ../units/piglit.pxu:139 |
849 | msgid "" |
850 | "This job combines all of the prior piglit results into one result file so " |
851 | "that they can be analyzed together. It is required to use piglit's built-in " |
852 | @@ -113,24 +113,24 @@ |
853 | msgstr "" |
854 | |
855 | #. summary |
856 | -#: ../units/piglit.pxu:140 |
857 | +#: ../units/piglit.pxu:155 |
858 | msgid "Create a HTML summary of all the piglit test results" |
859 | msgstr "" |
860 | |
861 | #. description |
862 | -#: ../units/piglit.pxu:141 |
863 | +#: ../units/piglit.pxu:156 |
864 | msgid "" |
865 | "This job runs the piglit HTML report generator on the combination of all the " |
866 | "past results." |
867 | msgstr "" |
868 | |
869 | #. summary |
870 | -#: ../units/piglit.pxu:159 |
871 | +#: ../units/piglit.pxu:174 |
872 | msgid "Archive HTML summary of all piglit test results" |
873 | msgstr "" |
874 | |
875 | #. description |
876 | -#: ../units/piglit.pxu:160 |
877 | +#: ../units/piglit.pxu:175 |
878 | msgid "" |
879 | "This job archives the HTML summary of all the piglit results for convenient " |
880 | "access. The result is not added as plainbox system attachment attachment but " |
881 | @@ -138,19 +138,19 @@ |
882 | msgstr "" |
883 | |
884 | #. name |
885 | -#: ../units/piglit.pxu:177 |
886 | +#: ../units/piglit.pxu:192 |
887 | msgid "Select piglit tests" |
888 | msgstr "" |
889 | |
890 | #. description |
891 | -#: ../units/piglit.pxu:178 |
892 | +#: ../units/piglit.pxu:193 |
893 | msgid "" |
894 | "This test plan runs a selection of piglit tests, summarizes them and creates " |
895 | "an archive for easy inspection and sharing." |
896 | msgstr "" |
897 | |
898 | #. description |
899 | -#: ../units/piglit.pxu:190 |
900 | +#: ../units/piglit.pxu:205 |
901 | msgid "Piglit Tests" |
902 | msgstr "" |
903 | |
904 | @@ -180,47 +180,43 @@ |
905 | msgid "Analyzing piglit test results (format 4)" |
906 | msgstr "" |
907 | |
908 | -#: ../bin/piglit-wrapper:160 |
909 | -msgid "Tool for running piglit tests" |
910 | -msgstr "" |
911 | - |
912 | -#: ../bin/piglit-wrapper:162 ../bin/piglit-combiner:172 |
913 | -#: ../bin/piglit-combiner:175 |
914 | +#: ../bin/piglit-wrapper:185 |
915 | +msgid "This version of piglit is not supported" |
916 | +msgstr "" |
917 | + |
918 | +#: ../bin/piglit-wrapper:188 |
919 | +msgid "Summary of results (by outcome)" |
920 | +msgstr "" |
921 | + |
922 | +#: ../bin/piglit-wrapper:195 |
923 | +msgid "Tests successful" |
924 | +msgstr "" |
925 | + |
926 | +#: ../bin/piglit-wrapper:198 |
927 | +msgid "Tests unsuccessful" |
928 | +msgstr "" |
929 | + |
930 | +#: ../bin/piglit-wrapper:204 ../bin/piglit-combiner:206 |
931 | +#: ../bin/piglit-combiner:209 |
932 | msgid "DIR" |
933 | msgstr "" |
934 | |
935 | -#: ../bin/piglit-wrapper:163 |
936 | +#: ../bin/piglit-wrapper:205 |
937 | msgid "save piglit results to DIR" |
938 | msgstr "" |
939 | |
940 | -#: ../bin/piglit-wrapper:165 |
941 | +#: ../bin/piglit-wrapper:207 |
942 | msgid "PATTERN" |
943 | msgstr "" |
944 | |
945 | -#: ../bin/piglit-wrapper:166 |
946 | +#: ../bin/piglit-wrapper:208 |
947 | msgid "run piglit tests matching given PATTERN" |
948 | msgstr "" |
949 | |
950 | -#: ../bin/piglit-wrapper:170 |
951 | +#: ../bin/piglit-wrapper:212 |
952 | msgid "be more verbose during testing" |
953 | msgstr "" |
954 | |
955 | -#: ../bin/piglit-wrapper:178 |
956 | -msgid "This version of piglit is not supported" |
957 | -msgstr "" |
958 | - |
959 | -#: ../bin/piglit-wrapper:181 |
960 | -msgid "Summary of results (by outcome)" |
961 | -msgstr "" |
962 | - |
963 | -#: ../bin/piglit-wrapper:188 |
964 | -msgid "Tests successful" |
965 | -msgstr "" |
966 | - |
967 | -#: ../bin/piglit-wrapper:191 |
968 | -msgid "Tests unsuccessful" |
969 | -msgstr "" |
970 | - |
971 | #: ../bin/piglit-combiner:44 |
972 | msgid "Discovering all results in directory: %r" |
973 | msgstr "" |
974 | @@ -241,56 +237,52 @@ |
975 | msgid "Combination function failed for: {!r}" |
976 | msgstr "" |
977 | |
978 | -#: ../bin/piglit-combiner:169 |
979 | -msgid "Tool for combining results of multiple runs of piglit" |
980 | -msgstr "" |
981 | - |
982 | -#: ../bin/piglit-combiner:173 |
983 | -msgid "directory with results to load (recursively)" |
984 | -msgstr "" |
985 | - |
986 | -#: ../bin/piglit-combiner:176 |
987 | -msgid "directory to save results to" |
988 | -msgstr "" |
989 | - |
990 | -#: ../bin/piglit-combiner:180 ../bin/piglit-archiver:54 |
991 | -msgid "be more verbose" |
992 | -msgstr "" |
993 | - |
994 | -#: ../bin/piglit-combiner:188 |
995 | +#: ../bin/piglit-combiner:194 |
996 | #, c-format |
997 | msgid "Unable to combine results: %s" |
998 | msgstr "" |
999 | |
1000 | -#: ../bin/piglit-combiner:192 |
1001 | +#: ../bin/piglit-combiner:198 |
1002 | #, c-format |
1003 | msgid "Combined %d result" |
1004 | msgid_plural "Combined %d results" |
1005 | msgstr[0] "" |
1006 | msgstr[1] "" |
1007 | |
1008 | -#: ../bin/piglit-combiner:194 |
1009 | +#: ../bin/piglit-combiner:200 |
1010 | msgid "No results were really combined!" |
1011 | msgstr "" |
1012 | |
1013 | -#: ../bin/piglit-archiver:38 |
1014 | -msgid "Tool for archiving piglit report" |
1015 | -msgstr "" |
1016 | - |
1017 | -#: ../bin/piglit-archiver:41 |
1018 | +#: ../bin/piglit-combiner:207 |
1019 | +msgid "directory with results to load (recursively)" |
1020 | +msgstr "" |
1021 | + |
1022 | +#: ../bin/piglit-combiner:210 |
1023 | +msgid "directory to save results to" |
1024 | +msgstr "" |
1025 | + |
1026 | +#: ../bin/piglit-combiner:214 ../bin/piglit-archiver:90 |
1027 | +msgid "be more verbose" |
1028 | +msgstr "" |
1029 | + |
1030 | +#: ../bin/piglit-archiver:70 |
1031 | +msgid "Archive with summary of piglit results is available in" |
1032 | +msgstr "" |
1033 | + |
1034 | +#: ../bin/piglit-archiver:77 |
1035 | msgid "base name of the archive" |
1036 | msgstr "" |
1037 | |
1038 | -#: ../bin/piglit-archiver:44 |
1039 | +#: ../bin/piglit-archiver:80 |
1040 | msgid "format of the archive to create" |
1041 | msgstr "" |
1042 | |
1043 | -#: ../bin/piglit-archiver:47 ../bin/piglit-archiver:50 |
1044 | +#: ../bin/piglit-archiver:83 |
1045 | msgid "root directory of the archive" |
1046 | msgstr "" |
1047 | |
1048 | -#: ../bin/piglit-archiver:63 |
1049 | -msgid "Archive with summary of piglit results is available in" |
1050 | +#: ../bin/piglit-archiver:86 |
1051 | +msgid "base directory of the archive" |
1052 | msgstr "" |
1053 | |
1054 | #: ../manage.py:25 |
1055 | |
1056 | === modified file 'providers/plainbox-provider-piglit/units/piglit.pxu' |
1057 | --- providers/plainbox-provider-piglit/units/piglit.pxu 2015-04-08 17:13:51 +0000 |
1058 | +++ providers/plainbox-provider-piglit/units/piglit.pxu 2015-04-22 13:03:51 +0000 |
1059 | @@ -1,3 +1,18 @@ |
1060 | +# This is for all the Python scripts |
1061 | +unit: packaging meta-data |
1062 | +os-id: debian |
1063 | +Depends: python3 (>= 3.2) |
1064 | + |
1065 | +# This is for piglit, obviously |
1066 | +unit: packaging meta-data |
1067 | +os-id: debian |
1068 | +Depends: piglit |
1069 | + |
1070 | +# This is for the scripts as well |
1071 | +unit: packaging meta-data |
1072 | +os-id: debian |
1073 | +Depends: python3-guacamole |
1074 | + |
1075 | unit: job |
1076 | id: piglit/test/fbo |
1077 | category_id: 2013.com.canonical.plainbox::graphics |
Something's wrong with the guacamolized version :(
e.g. the archiver command should do something like this:
$ providers/ plainbox- provider- piglit/ bin/piglit- archiver -n bogus -r /tmp/tools-vivid -b /tmp/tools-vivid --verbose combiner: INFO: Creating tar archive bzr/trunk/ bogus.tar. gz
piglit-
Archive with summary of piglit results is available in
/src/checkbox/
I installed guacamole in an active venv:
$ pip list
guacamole (0.8)
pip (1.5.4)
setuptools (2.2)
Calling the guacamolized piglit-archiver says this:
$ providers/ plainbox- provider- piglit/ bin/piglit- archiver -n bogus -r /tmp -b /tmp --verbose
usage: piglit-archiver [-h]
piglit-archiver: error: unrecognized arguments: -n
Maybe the piglit provider doesn't benefit much from guacamole? it doesn't seem to (yet) use any of the fancy features and looking at the code it essentially does the same (but with more code - that's what jumps to me but I realize that "it's actually more code" is not the best way to judge a refactoring).
I wonder if this is preparation for the future, in which case it would be OK to me (we just need to fix the problem I showed above).