System Environment: -------------------------- Piglit: 0e1d119e94019922a0a084e71c099e6553f76b01 Bug detailed description: --------------------------- Piglit make fail. Bisect shows: 0e1d119e94019922a0a084e71c099e6553f76b01 is the first bad commit. commit 0e1d119e94019922a0a084e71c099e6553f76b01 Author: Dylan Baker <baker.dylan.c@gmail.com> AuthorDate: Fri Feb 20 12:43:15 2015 -0800 Commit: Dylan Baker <baker.dylan.c@gmail.com> CommitDate: Mon Feb 23 15:47:10 2015 -0800 registry generation: Finish hybridizing registry/gl.py and tests/util/gen_dispatch.py and pretty much indistinguishable in purpose, so it makes sense to finish porting them together. This is actually not very invasive, a few calls to six, and a few cases of using forward compatible functions (functools.reduce instead of the builtin reduce, which was removed in python3) The resulting output is exactly the same. v2: - Use else: assert six.PY3 (jljusten) Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> output: [ 0%] Generating tests/util/piglit-dispatch-gen.c, tests/util/piglit-dispatch-gen.h, tests/util/piglit-util-gl-enum-gen.c Traceback (most recent call last): File "/GFX/Test/Piglit/piglit/tests/util/gen_dispatch.py", line 170, in <module> main() File "/GFX/Test/Piglit/piglit/tests/util/gen_dispatch.py", line 66, in main gl_registry = registry.gl.parse() File "/GFX/Test/Piglit/piglit/tests/util/../../registry/gl.py", line 61, in parse return Registry(xml_registry) File "/GFX/Test/Piglit/piglit/tests/util/../../registry/gl.py", line 363, in __init__ enum_group = EnumGroup(xml_enums) File "/GFX/Test/Piglit/piglit/tests/util/../../registry/gl.py", line 1055, in __init__ self.enums.add(Enum(self, xml_enum)) File "/GFX/Test/Piglit/piglit/tests/util/../../registry/gl.py", line 1115, in __init__ if six.PY2: AttributeError: 'module' object has no attribute 'PY2' make[2]: *** [tests/util/piglit-dispatch-gen.c] Error 1 make[1]: *** [CMakeFiles/piglit_dispatch_gen.dir/all] Error 2 make: *** [all] Error 2
commit 013f591b7f7f37fe02f1ac4593fd3dab640f7d05 Author: Vinson Lee <vlee@freedesktop.org> Date: Wed Feb 25 18:39:54 2015 -0800 cmake: Require Python six >= 1.4.0. six.PY2 was added in 1.4.0. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Verified.Fixed.
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.