On Sun, Oct 11, 2020 at 01:06:56AM -0400, Daniel Dickman wrote:
> piglit is a consumer of python2 numpy. because newer versions of numpy are
> python3-only, the diff below proposes to move piglit from python2 to
> python3 so numpy can be updated.
>
> By moving to python3 we can also get rid of the py-subprocess32
> dependency.
>
> I don't know too much about piglit but I was able to run "piglit run
> sanity results" on my amd64 box.
>
> The one nice thing about moving from py2 to py3 is that "make
> update-plist" repairs some of the odd substitutions that are in the
> current PLIST. So a bunch of the PLIST changes below are just due to:
>
> "co${MODPY_PY_PREFIX}" -> "copy-"
>
> ok?
These changes look fine to me, ok jsg@
we should also handle the lack of libgen.h includes for basename(3)
'warning: implicit declaration of function 'basename' is invalid in C99
[-Wimplicit-function-declaration]'
seen with
tests/util/piglit-util.c
tests/util/piglit-framework-gl.c
tests/util/piglit-framework-gl.c
tests/util/piglit-framework-gl.c
tests/egl/spec/egl_chromium_sync_control/egl_chromium_sync_control.c
tests/util/piglit-framework-gl.c
but that could be a different commit
There is a warning on python 3.9 I see when building
generated_tests/gen_shader_precision_tests.py:88: DeprecationWarning: Using or
importing the ABCs from 'collections' instead of from 'collections.abc' is
deprecated since Python 3.3, and in 3.9 it will stop working
return isinstance(arg, (collections.Sequence, numpy.ndarray))
but we default to 3.8 for now and this would likely be addressed by
updating piglit at some point.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/piglit/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 Makefile
> --- Makefile 26 Aug 2020 03:23:40 -0000 1.11
> +++ Makefile 11 Oct 2020 04:55:15 -0000
> @@ -4,7 +4,7 @@ COMMENT = automated OpenGL and OpenCL te
> ONLY_FOR_ARCHS = amd64 i386
>
> DISTNAME = piglit-20190208
> -REVISION = 4
> +REVISION = 5
>
> GH_ACCOUNT = mesa3d
> GH_PROJECT = piglit
> @@ -26,12 +26,11 @@ COMPILER = base-clang ports-gcc base-gc
> MODULES = devel/cmake \
> lang/python
>
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -RUN_DEPENDS = devel/py-six \
> - devel/py-subprocess32 \
> - math/py-numpy \
> - www/py-mako
> +RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
> + math/py-numpy${MODPY_FLAVOR} \
> + www/py-mako${MODPY_FLAVOR}
> BUILD_DEPENDS = ${RUN_DEPENDS}
>
> LIB_DEPENDS = graphics/waffle \
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/piglit/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 PLIST
> --- pkg/PLIST 12 Feb 2019 02:26:40 -0000 1.2
> +++ pkg/PLIST 11 Oct 2020 04:55:22 -0000
> @@ -720,7 +720,7 @@ lib/piglit/bin/
> @bin lib/piglit/bin/clip-plane-transformation
> @bin lib/piglit/bin/clipflat
> @bin lib/piglit/bin/compressedteximage
> -@bin lib/piglit/bin/co${MODPY_PY_PREFIX}pixels
> +@bin lib/piglit/bin/copy-pixels
> @bin lib/piglit/bin/copy_buffer_coherency
> @bin lib/piglit/bin/copybuffersubdata
> @bin lib/piglit/bin/copypixels-draw-sync
> @@ -774,7 +774,7 @@ lib/piglit/bin/
> @bin lib/piglit/bin/early-z
> @bin lib/piglit/bin/egl-configless-context
> @bin lib/piglit/bin/egl-context-priority
> -@bin lib/piglit/bin/egl-co${MODPY_PY_PREFIX}buffers
> +@bin lib/piglit/bin/egl-copy-buffers
> @bin lib/piglit/bin/egl-create-context-core-profile
> @bin lib/piglit/bin/egl-create-context-default-major-version-gl
> @bin lib/piglit/bin/egl-create-context-default-major-version-gles
> @@ -1373,7 +1373,7 @@ lib/piglit/bin/
> @bin lib/piglit/bin/glx-buffer-age
> @bin lib/piglit/bin/glx-close-display
> @bin lib/piglit/bin/glx-context-flush-control
> -@bin lib/piglit/bin/glx-co${MODPY_PY_PREFIX}sub-buffer
> +@bin lib/piglit/bin/glx-copy-sub-buffer
> @bin lib/piglit/bin/glx-create-context-core-profile
> @bin lib/piglit/bin/glx-create-context-current-no-framebuffer
> @bin lib/piglit/bin/glx-create-context-default-major-version
> @@ -1726,90 +1726,96 @@ lib/piglit/bin/
> @bin lib/piglit/bin/zero-tex-coord
> lib/piglit/framework/
> lib/piglit/framework/__init__.py
> -lib/piglit/framework/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/framework/${MODPY_PYCACHE}/
> +lib/piglit/framework/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}dmesg.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}driver_classifier.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}grouptools.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}monitoring.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}results.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/${MODPY_PYCACHE}wflinfo.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/framework/backends/
> lib/piglit/framework/backends/__init__.py
> -lib/piglit/framework/backends/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/framework/backends/${MODPY_PYCACHE}/
> +lib/piglit/framework/backends/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/backends/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/backends/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/backends/${MODPY_PYCACHE}json.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/backends/${MODPY_PYCACHE}junit.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/backends/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/framework/backends/abstract.py
> -lib/piglit/framework/backends/abstract.pyc
> lib/piglit/framework/backends/compression.py
> -lib/piglit/framework/backends/compression.pyc
> lib/piglit/framework/backends/json.py
> -lib/piglit/framework/backends/json.pyc
> lib/piglit/framework/backends/junit.py
> -lib/piglit/framework/backends/junit.pyc
> lib/piglit/framework/backends/register.py
> -lib/piglit/framework/backends/register.pyc
> lib/piglit/framework/compat.py
> -lib/piglit/framework/compat.pyc
> lib/piglit/framework/core.py
> -lib/piglit/framework/core.pyc
> lib/piglit/framework/dmesg.py
> -lib/piglit/framework/dmesg.pyc
> lib/piglit/framework/driver_classifier.py
> -lib/piglit/framework/driver_classifier.pyc
> lib/piglit/framework/exceptions.py
> -lib/piglit/framework/exceptions.pyc
> lib/piglit/framework/grouptools.py
> -lib/piglit/framework/grouptools.pyc
> lib/piglit/framework/log.py
> -lib/piglit/framework/log.pyc
> lib/piglit/framework/monitoring.py
> -lib/piglit/framework/monitoring.pyc
> lib/piglit/framework/options.py
> -lib/piglit/framework/options.pyc
> lib/piglit/framework/profile.py
> -lib/piglit/framework/profile.pyc
> lib/piglit/framework/programs/
> lib/piglit/framework/programs/__init__.py
> -lib/piglit/framework/programs/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/framework/programs/${MODPY_PYCACHE}/
> +lib/piglit/framework/programs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/programs/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/programs/${MODPY_PYCACHE}print_commands.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/programs/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/programs/${MODPY_PYCACHE}summary.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/framework/programs/parsers.py
> -lib/piglit/framework/programs/parsers.pyc
> lib/piglit/framework/programs/print_commands.py
> -lib/piglit/framework/programs/print_commands.pyc
> lib/piglit/framework/programs/run.py
> -lib/piglit/framework/programs/run.pyc
> lib/piglit/framework/programs/summary.py
> -lib/piglit/framework/programs/summary.pyc
> lib/piglit/framework/results.py
> -lib/piglit/framework/results.pyc
> lib/piglit/framework/status.py
> -lib/piglit/framework/status.pyc
> lib/piglit/framework/summary/
> lib/piglit/framework/summary/__init__.py
> -lib/piglit/framework/summary/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/framework/summary/${MODPY_PYCACHE}/
> +lib/piglit/framework/summary/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/summary/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/summary/${MODPY_PYCACHE}console_.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/summary/${MODPY_PYCACHE}feature.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/summary/${MODPY_PYCACHE}html_.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/framework/summary/common.py
> -lib/piglit/framework/summary/common.pyc
> lib/piglit/framework/summary/console_.py
> -lib/piglit/framework/summary/console_.pyc
> lib/piglit/framework/summary/feature.py
> -lib/piglit/framework/summary/feature.pyc
> lib/piglit/framework/summary/html_.py
> -lib/piglit/framework/summary/html_.pyc
> lib/piglit/framework/test/
> lib/piglit/framework/test/__init__.py
> -lib/piglit/framework/test/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/framework/test/${MODPY_PYCACHE}/
> +lib/piglit/framework/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}deqp.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}glsl_parser_test.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}gtest.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}oclconform.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}opencv.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}opengl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}piglit_test.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/framework/test/${MODPY_PYCACHE}shader_test.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/framework/test/base.py
> -lib/piglit/framework/test/base.pyc
> lib/piglit/framework/test/deqp.py
> -lib/piglit/framework/test/deqp.pyc
> lib/piglit/framework/test/glsl_parser_test.py
> -lib/piglit/framework/test/glsl_parser_test.pyc
> lib/piglit/framework/test/gtest.py
> -lib/piglit/framework/test/gtest.pyc
> lib/piglit/framework/test/oclconform.py
> -lib/piglit/framework/test/oclconform.pyc
> lib/piglit/framework/test/opencv.py
> -lib/piglit/framework/test/opencv.pyc
> lib/piglit/framework/test/opengl.py
> -lib/piglit/framework/test/opengl.pyc
> lib/piglit/framework/test/piglit_test.py
> -lib/piglit/framework/test/piglit_test.pyc
> lib/piglit/framework/test/shader_test.py
> -lib/piglit/framework/test/shader_test.pyc
> lib/piglit/framework/wflinfo.py
> -lib/piglit/framework/wflinfo.pyc
> lib/piglit/generated_tests/
> +${MODPY_COMMENT}lib/piglit/generated_tests/${MODPY_PYCACHE}/
> lib/piglit/generated_tests/asmparsertest/
> lib/piglit/generated_tests/asmparsertest/shaders/
> lib/piglit/generated_tests/asmparsertest/shaders/ARBvp1.0/
> @@ -1958,6 +1964,7 @@ lib/piglit/generated_tests/cl/store/
> lib/piglit/generated_tests/cl/store/store-kernels-global.inc
> lib/piglit/generated_tests/cl/store/store-kernels-local.inc
> lib/piglit/generated_tests/modules/
> +${MODPY_COMMENT}lib/piglit/generated_tests/modules/${MODPY_PYCACHE}/
> lib/piglit/generated_tests/spec/
> lib/piglit/generated_tests/spec/ARB_shader_image_load_store/
> lib/piglit/generated_tests/spec/ARB_shader_image_load_store/compiler/
> @@ -44263,6 +44270,7 @@ lib/piglit/generated_tests/spec/oes_text
>
> lib/piglit/generated_tests/spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.tese
>
> lib/piglit/generated_tests/spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.vert
> lib/piglit/generated_tests/templates/
> +${MODPY_COMMENT}lib/piglit/generated_tests/templates/${MODPY_PYCACHE}/
> lib/piglit/generated_tests/templates/gen_builtin_packing_tests/
> lib/piglit/generated_tests/templates/gen_const_builtin_equal_tests/
> lib/piglit/generated_tests/templates/gen_conversion/
> @@ -44284,13 +44292,13 @@ lib/piglit/generated_tests/templates/gen
> lib/piglit/generated_tests/templates/gen_vs_in_fp64/
>
> lib/piglit/generated_tests/templates/interpolation-qualifier-built-in-variable/
> lib/piglit/lib/
> -lib/piglit/lib/libhiz-util.so
> -lib/piglit/lib/libpiglitglxutil.so
> -lib/piglit/lib/libpiglitutil.so
> -lib/piglit/lib/libpiglitutil_gl.so
> -lib/piglit/lib/libpiglitutil_gles1.so
> -lib/piglit/lib/libpiglitutil_gles2.so
> -lib/piglit/lib/libpiglitutil_gles3.so
> +@so lib/piglit/lib/libhiz-util.so
> +@so lib/piglit/lib/libpiglitglxutil.so
> +@so lib/piglit/lib/libpiglitutil.so
> +@so lib/piglit/lib/libpiglitutil_gl.so
> +@so lib/piglit/lib/libpiglitutil_gles1.so
> +@so lib/piglit/lib/libpiglitutil_gles2.so
> +@so lib/piglit/lib/libpiglitutil_gles3.so
> lib/piglit/templates/
> lib/piglit/templates/empty_status.mako
> lib/piglit/templates/feature.mako
> @@ -44301,11 +44309,36 @@ lib/piglit/templates/test_result.mako
> lib/piglit/templates/testrun_info.mako
> lib/piglit/tests/
> lib/piglit/tests/__init__.py
> -lib/piglit/tests/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/tests/${MODPY_PYCACHE}/
> +lib/piglit/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}crucible.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}cts_gl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}cts_gl45.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}cts_gles.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}deqp_egl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}deqp_gles2.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}deqp_gles3.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}deqp_gles31.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}deqp_vk.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}es3conform.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}find_static_tests.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}gtf_gl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}gtf_gles.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}igt.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}khr_gl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}khr_gl45.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}khr_gles.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}khr_noctx.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}oglconform.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}opencl_foreign.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}vulkan.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}xts-render.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/${MODPY_PYCACHE}xts.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/tests/all.meta.xml
> lib/piglit/tests/apitrace/
> +${MODPY_COMMENT}lib/piglit/tests/apitrace/${MODPY_PYCACHE}/
> +lib/piglit/tests/apitrace/${MODPY_PYCACHE}test-trace.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/tests/apitrace/test-trace.py
> -lib/piglit/tests/apitrace/test-trace.pyc
> lib/piglit/tests/asmparsertest/
> lib/piglit/tests/asmparsertest/shaders/
> lib/piglit/tests/asmparsertest/shaders/ARBfp1.0/
> @@ -44843,23 +44876,14 @@ lib/piglit/tests/cl/template_program.cl
> lib/piglit/tests/cl/template_program.program_test
> lib/piglit/tests/cpu.meta.xml
> lib/piglit/tests/crucible.py
> -lib/piglit/tests/crucible.pyc
> lib/piglit/tests/cts_gl.py
> -lib/piglit/tests/cts_gl.pyc
> lib/piglit/tests/cts_gl45.py
> -lib/piglit/tests/cts_gl45.pyc
> lib/piglit/tests/cts_gles.py
> -lib/piglit/tests/cts_gles.pyc
> lib/piglit/tests/deqp_egl.py
> -lib/piglit/tests/deqp_egl.pyc
> lib/piglit/tests/deqp_gles2.py
> -lib/piglit/tests/deqp_gles2.pyc
> lib/piglit/tests/deqp_gles3.py
> -lib/piglit/tests/deqp_gles3.pyc
> lib/piglit/tests/deqp_gles31.py
> -lib/piglit/tests/deqp_gles31.pyc
> lib/piglit/tests/deqp_vk.py
> -lib/piglit/tests/deqp_vk.pyc
> lib/piglit/tests/egl/
> lib/piglit/tests/egl/spec/
> lib/piglit/tests/egl/spec/egl-1.4/
> @@ -44878,7 +44902,6 @@ lib/piglit/tests/egl/spec/egl_khr_surfac
> lib/piglit/tests/egl/spec/egl_mesa_device_software/
> lib/piglit/tests/egl/spec/egl_mesa_platform_surfaceless/
> lib/piglit/tests/es3conform.py
> -lib/piglit/tests/es3conform.pyc
> lib/piglit/tests/fast_color_clear/
> lib/piglit/tests/fast_color_clear/all-colors.shader_test
> lib/piglit/tests/fast_color_clear/fast-slow-clear-interaction.shader_test
> @@ -44886,7 +44909,6 @@ lib/piglit/tests/fast_color_clear/non-re
> lib/piglit/tests/fast_color_clear/redundant-clear.shader_test
> lib/piglit/tests/fbo/
> lib/piglit/tests/find_static_tests.py
> -lib/piglit/tests/find_static_tests.pyc
> lib/piglit/tests/general/
> lib/piglit/tests/glslparser.xml.gz
> lib/piglit/tests/glslparser_arb_compat.xml.gz
> @@ -44895,6 +44917,8 @@ lib/piglit/tests/glslparsertest/glsl2/
> lib/piglit/tests/glslparsertest/glsl2/16384-consecutive-chars.frag
> lib/piglit/tests/glslparsertest/glsl2/16385-consecutive-chars.frag
> lib/piglit/tests/glslparsertest/glsl2/17000-consecutive-chars-identifier.frag
> +${MODPY_COMMENT}lib/piglit/tests/glslparsertest/glsl2/${MODPY_PYCACHE}/
> +lib/piglit/tests/glslparsertest/glsl2/${MODPY_PYCACHE}gen_builtin_test.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/tests/glslparsertest/glsl2/array-04.vert
> lib/piglit/tests/glslparsertest/glsl2/array-05.vert
> lib/piglit/tests/glslparsertest/glsl2/array-06.vert
> @@ -45060,7 +45084,6 @@ lib/piglit/tests/glslparsertest/glsl2/fu
> lib/piglit/tests/glslparsertest/glsl2/function-10.vert
> lib/piglit/tests/glslparsertest/glsl2/function-11.vert
> lib/piglit/tests/glslparsertest/glsl2/gen_builtin_test.py
> -lib/piglit/tests/glslparsertest/glsl2/gen_builtin_test.pyc
> lib/piglit/tests/glslparsertest/glsl2/glsl-pp-elif-no-expression-2.frag
> lib/piglit/tests/glslparsertest/glsl2/gst-gl-bulge.frag
> lib/piglit/tests/glslparsertest/glsl2/gst-gl-bumper.frag
> @@ -45434,34 +45457,26 @@ lib/piglit/tests/glx/
> lib/piglit/tests/gpu.meta.xml
> lib/piglit/tests/gpu.no_isolation.meta.xml
> lib/piglit/tests/gtf_gl.py
> -lib/piglit/tests/gtf_gl.pyc
> lib/piglit/tests/gtf_gles.py
> -lib/piglit/tests/gtf_gles.pyc
> lib/piglit/tests/hiz/
> lib/piglit/tests/igt.py
> -lib/piglit/tests/igt.pyc
> lib/piglit/tests/khr_gl.py
> -lib/piglit/tests/khr_gl.pyc
> lib/piglit/tests/khr_gl45.py
> -lib/piglit/tests/khr_gl45.pyc
> lib/piglit/tests/khr_gles.py
> -lib/piglit/tests/khr_gles.pyc
> lib/piglit/tests/khr_noctx.py
> -lib/piglit/tests/khr_noctx.pyc
> lib/piglit/tests/llvmpipe.meta.xml
> lib/piglit/tests/llvmpipe_gl.xml.gz
> lib/piglit/tests/no_error.xml.gz
> lib/piglit/tests/oglconform.py
> -lib/piglit/tests/oglconform.pyc
> lib/piglit/tests/opencl_foreign.py
> -lib/piglit/tests/opencl_foreign.pyc
> lib/piglit/tests/opengl.xml.gz
> lib/piglit/tests/perf/
> lib/piglit/tests/py_modules/
> lib/piglit/tests/py_modules/__init__.py
> -lib/piglit/tests/py_modules/__init__.pyc
> +${MODPY_COMMENT}lib/piglit/tests/py_modules/${MODPY_PYCACHE}/
> +lib/piglit/tests/py_modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/piglit/tests/py_modules/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/tests/py_modules/constants.py
> -lib/piglit/tests/py_modules/constants.pyc
> lib/piglit/tests/quick.meta.xml
> lib/piglit/tests/quick.no_isolation.meta.xml
> lib/piglit/tests/quick_cl.meta.xml
> @@ -45593,14 +45608,14 @@ lib/piglit/tests/shaders/glsl-const-init
> lib/piglit/tests/shaders/glsl-const-initializer-02.shader_test
> lib/piglit/tests/shaders/glsl-const-initializer-03.shader_test
> lib/piglit/tests/shaders/glsl-constant-folding-call-1.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-if-1.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-if-2.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-if-3.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-loop-1.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-loop-2.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-self-1.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-self-2.shader_test
> -lib/piglit/tests/shaders/glsl-co${MODPY_PY_PREFIX}propagation-vector-indexing.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-if-1.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-if-2.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-if-3.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-loop-1.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-loop-2.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-self-1.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-self-2.shader_test
> +lib/piglit/tests/shaders/glsl-copy-propagation-vector-indexing.shader_test
> lib/piglit/tests/shaders/glsl-deadcode-call.shader_test
> lib/piglit/tests/shaders/glsl-deadcode-self-assign.shader_test
> lib/piglit/tests/shaders/glsl-deadcode-varying.shader_test
> @@ -45647,8 +45662,8 @@ lib/piglit/tests/shaders/glsl-fs-continu
> lib/piglit/tests/shaders/glsl-fs-continue-inside-do-while.shader_test
> lib/piglit/tests/shaders/glsl-fs-convolution-1.shader_test
> lib/piglit/tests/shaders/glsl-fs-convolution-2.shader_test
> -lib/piglit/tests/shaders/glsl-fs-co${MODPY_PY_PREFIX}propagation-texcoords-1.shader_test
> -lib/piglit/tests/shaders/glsl-fs-co${MODPY_PY_PREFIX}propagation-texcoords-2.shader_test
> +lib/piglit/tests/shaders/glsl-fs-copy-propagation-texcoords-1.shader_test
> +lib/piglit/tests/shaders/glsl-fs-copy-propagation-texcoords-2.shader_test
> lib/piglit/tests/shaders/glsl-fs-cross-2.shader_test
> lib/piglit/tests/shaders/glsl-fs-cross-3.shader_test
> lib/piglit/tests/shaders/glsl-fs-cross.shader_test
> @@ -45657,7 +45672,7 @@ lib/piglit/tests/shaders/glsl-fs-discard
> lib/piglit/tests/shaders/glsl-fs-discard-04.shader_test
> lib/piglit/tests/shaders/glsl-fs-dot-vec2-2.shader_test
> lib/piglit/tests/shaders/glsl-fs-dot-vec2.shader_test
> -lib/piglit/tests/shaders/glsl-fs-double-negative-co${MODPY_PY_PREFIX}propagation.shader_test
> +lib/piglit/tests/shaders/glsl-fs-double-negative-copy-propagation.shader_test
> lib/piglit/tests/shaders/glsl-fs-exp.shader_test
> lib/piglit/tests/shaders/glsl-fs-exp2.frag
> lib/piglit/tests/shaders/glsl-fs-f2b.shader_test
> @@ -45887,14 +45902,14 @@ lib/piglit/tests/shaders/glsl-vs-clamp-1
> lib/piglit/tests/shaders/glsl-vs-constructor-call.shader_test
> lib/piglit/tests/shaders/glsl-vs-continue-in-switch-in-do-while.shader_test
> lib/piglit/tests/shaders/glsl-vs-continue-inside-do-while.shader_test
> -lib/piglit/tests/shaders/glsl-vs-co${MODPY_PY_PREFIX}propagation-1.shader_test
> +lib/piglit/tests/shaders/glsl-vs-copy-propagation-1.shader_test
> lib/piglit/tests/shaders/glsl-vs-cross-2.shader_test
> lib/piglit/tests/shaders/glsl-vs-cross-3.shader_test
> lib/piglit/tests/shaders/glsl-vs-cross.shader_test
> lib/piglit/tests/shaders/glsl-vs-deadcode-1.shader_test
> lib/piglit/tests/shaders/glsl-vs-deadcode-2.shader_test
> lib/piglit/tests/shaders/glsl-vs-dot-vec2.shader_test
> -lib/piglit/tests/shaders/glsl-vs-double-negative-co${MODPY_PY_PREFIX}propagation.shader_test
> +lib/piglit/tests/shaders/glsl-vs-double-negative-copy-propagation.shader_test
> lib/piglit/tests/shaders/glsl-vs-f2b.shader_test
> lib/piglit/tests/shaders/glsl-vs-ff-frag.shader_test
> lib/piglit/tests/shaders/glsl-vs-functions-2.shader_test
> @@ -45967,7 +45982,7 @@ lib/piglit/tests/shaders/loopfunc.shader
> lib/piglit/tests/shaders/really-big-triangle.shader_test
> lib/piglit/tests/shaders/ssa/
> lib/piglit/tests/shaders/ssa/fs-if-def-else-break.shader_test
> -lib/piglit/tests/shaders/ssa/fs-lost-co${MODPY_PY_PREFIX}problem.shader_test
> +lib/piglit/tests/shaders/ssa/fs-lost-copy-problem.shader_test
> lib/piglit/tests/shaders/ssa/fs-swap-problem.shader_test
> lib/piglit/tests/shaders/ssa/fs-while-loop-rotate-value.shader_test
> lib/piglit/tests/shaders/vbo/
> @@ -47557,8 +47572,8 @@ lib/piglit/tests/spec/arb_shader_storage
>
> lib/piglit/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-uint.shader_test
> lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/
>
> lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/buffer-variable-indirect-indexing.shader_test
> -lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/co${MODPY_PY_PREFIX}large-array.shader_test
> -lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/co${MODPY_PY_PREFIX}large-struct.shader_test
> +lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/copy-large-array.shader_test
> +lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/copy-large-struct.shader_test
>
> lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
>
> lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/instance-matching-shader-storage-blocks-array-size-mismatch.shader_test
>
> lib/piglit/tests/spec/arb_shader_storage_buffer_object/linker/instance-matching-shader-storage-blocks-binding-qualifier-mismatch.shader_test
> @@ -49534,7 +49549,7 @@ lib/piglit/tests/spec/glsl-1.40/uniform_
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-mat4-row-major.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-mat4.shader_test
>
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-saturated-vec-array.shader_test
> -lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-struct-co${MODPY_PY_PREFIX}complicated.shader_test
> +lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy-complicated.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-struct-pad.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/fs-struct.shader_test
> @@ -49547,7 +49562,7 @@ lib/piglit/tests/spec/glsl-1.40/uniform_
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-floats.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-mat4-row-major.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-mat4.shader_test
> -lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-struct-co${MODPY_PY_PREFIX}complicated.shader_test
> +lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-struct-copy-complicated.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-struct-copy.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-struct-pad.shader_test
> lib/piglit/tests/spec/glsl-1.40/uniform_buffer/vs-struct.shader_test
> @@ -50117,7 +50132,7 @@ lib/piglit/tests/spec/glsl-1.50/uniform_
> lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-mat4.shader_test
>
> lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-mat4x3-row-major.shader_test
> lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-mat4x3.shader_test
> -lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-struct-co${MODPY_PY_PREFIX}complicated.shader_test
> +lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-struct-copy-complicated.shader_test
> lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-struct-copy.shader_test
> lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-struct-pad.shader_test
> lib/piglit/tests/spec/glsl-1.50/uniform_buffer/gs-struct.shader_test
> @@ -50327,12 +50342,12 @@ lib/piglit/tests/spec/glsl-es-3.00/compi
> lib/piglit/tests/spec/glsl-es-3.00/execution/
> lib/piglit/tests/spec/glsl-es-3.00/execution/sanity.shader_test
> lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-basic.shader_test
> -lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-co${MODPY_PY_PREFIX}function-fs.shader_test
> -lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-co${MODPY_PY_PREFIX}local-fs.shader_test
> -lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-co${MODPY_PY_PREFIX}local-vs.shader_test
> -lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-co${MODPY_PY_PREFIX}out-vs.shader_test
> -lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-co${MODPY_PY_PREFIX}return-vs.shader_test
> -lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-co${MODPY_PY_PREFIX}uniform-vs.shader_test
> +lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-copy-function-fs.shader_test
> +lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-copy-local-fs.shader_test
> +lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-copy-local-vs.shader_test
> +lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-copy-out-vs.shader_test
> +lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-copy-return-vs.shader_test
> +lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-copy-uniform-vs.shader_test
>
> lib/piglit/tests/spec/glsl-es-3.00/execution/varying-struct-interpolation.shader_test
> lib/piglit/tests/spec/glsl-es-3.00/linker/
>
> lib/piglit/tests/spec/glsl-es-3.00/linker/glsl-mismatched-uniform-precision-unused.shader_test
> @@ -50902,13 +50917,13 @@ lib/piglit/tests/spec/oes_viewport_array
> lib/piglit/tests/texturing/
> lib/piglit/tests/texturing/shaders/
> lib/piglit/tests/util/
> +${MODPY_COMMENT}lib/piglit/tests/util/${MODPY_PYCACHE}/
> +lib/piglit/tests/util/${MODPY_PYCACHE}gen_dispatch.${MODPY_PYC_MAGIC_TAG}pyc
> lib/piglit/tests/util/gen_dispatch.py
> -lib/piglit/tests/util/gen_dispatch.pyc
> lib/piglit/tests/util/piglit-framework-gl/
> lib/piglit/tests/util/piglit-framework-gl/README.txt
> lib/piglit/tests/vulkan/
> lib/piglit/tests/vulkan.py
> -lib/piglit/tests/vulkan.pyc
> lib/piglit/tests/vulkan.xml.gz
> lib/piglit/tests/vulkan/glsl450/
> lib/piglit/tests/vulkan/glsl450/face-forward-double.vk_shader_test
> @@ -50924,9 +50939,7 @@ lib/piglit/tests/vulkan/shaders/fs-large
> lib/piglit/tests/vulkan/shaders/fs-multiple-large-local-array.vk_shader_test
> lib/piglit/tests/wgl/
> lib/piglit/tests/xts-render.py
> -lib/piglit/tests/xts-render.pyc
> lib/piglit/tests/xts.py
> -lib/piglit/tests/xts.pyc
> share/doc/piglit/
> share/doc/piglit/COPYING
> share/doc/piglit/README.md
>
>
