Reviewed-by: Dylan Baker <dylanx.c.ba...@intel.com>
On Wednesday, December 17, 2014 10:46:38 AM Brian Paul wrote:
> As with the previous patch, fixes patch corruption on Cygwin.
> ---
> tests/all.py | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tests/all.py b/tests/all.py
> index 2ffb920..ba26ebd 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -1030,7 +1030,7 @@ spec['glsl-es-1.00']['execution'] = {}
> add_shader_test_dir(spec['glsl-es-1.00']['execution'],
> os.path.join(testsDir, 'spec', 'glsl-es-1.00',
> 'execution'),
> recursive=True)
> -spec['glsl-es-1.00']['built-in constants'] =
> PiglitGLTest('built-in-constants_gles2 ' + os.path.join(testsDir,
> 'spec/glsl-es-1.00/minimum-maximums.txt'), run_concurrent=True)
> +spec['glsl-es-1.00']['built-in constants'] =
> PiglitGLTest(['built-in-constants_gles2', os.path.join(testsDir,
> 'spec/glsl-es-1.00/minimum-maximums.txt')], run_concurrent=True)
>
> # Group spec/glsl-1.10
> spec['glsl-1.10'] = {}
> @@ -1059,7 +1059,7 @@ for type in ['int', 'uint', 'float', 'vec2', 'vec3',
> 'vec4', 'ivec2', 'ivec3',
> cmdline = 'simple {0} {1}'.format(type, arrayspec)
> spec['glsl-1.10']['execution']['varying-packing'][cmdline] = \
> PiglitGLTest('varying-packing-' + cmdline, run_concurrent=True)
> -spec['glsl-1.10']['built-in constants'] = PiglitGLTest('built-in-constants '
> + os.path.join(testsDir, 'spec/glsl-1.10/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['glsl-1.10']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/glsl-1.10/minimum-maximums.txt')], run_concurrent=True)
>
> spec['glsl-1.10']['api'] = {}
> add_concurrent_test(spec['glsl-1.10']['api'], 'getactiveattrib 110');
> @@ -1109,7 +1109,7 @@ add_recursion_test(rec, 'indirect-separate')
> add_recursion_test(rec, 'indirect-complex')
> add_recursion_test(rec, 'indirect-complex-separate')
>
> -spec['glsl-1.20']['built-in constants'] = PiglitGLTest('built-in-constants '
> + os.path.join(testsDir, 'spec/glsl-1.20/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['glsl-1.20']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/glsl-1.20/minimum-maximums.txt')], run_concurrent=True)
> spec['glsl-1.20']['api'] = {}
> add_concurrent_test(spec['glsl-1.20']['api'], 'getactiveattrib 120');
>
> @@ -1218,7 +1218,7 @@ add_concurrent_test(spec['glsl-1.30']['execution'],
> 'vertexid-drawarrays')
> add_concurrent_test(spec['glsl-1.30']['execution'], 'vertexid-drawelements')
> add_concurrent_test(spec['glsl-1.30']['execution'], 'fs-execution-ordering')
>
> -spec['glsl-1.30']['built-in constants'] = PiglitGLTest('built-in-constants '
> + os.path.join(testsDir, 'spec/glsl-1.30/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['glsl-1.30']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/glsl-1.30/minimum-maximums.txt')], run_concurrent=True)
> spec['glsl-1.30']['api'] = {}
> add_concurrent_test(spec['glsl-1.30']['api'], 'getactiveattrib 130');
>
> @@ -1403,7 +1403,7 @@ add_shader_test_dir(spec['glsl-1.40'],
> os.path.join(testsDir, 'spec', 'glsl-1.40'),
> recursive=True)
> spec['glsl-1.40']['execution']['tf-no-position'] =
> PiglitGLTest('glsl-1.40-tf-no-position', run_concurrent=True)
> -spec['glsl-1.40']['built-in constants'] = PiglitGLTest('built-in-constants '
> + os.path.join(testsDir, 'spec/glsl-1.40/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['glsl-1.40']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/glsl-1.40/minimum-maximums.txt')], run_concurrent=True)
>
> textureSize_samplers_140 = textureSize_samplers_130 + ['sampler2DRect',
> 'isampler2DRect', 'sampler2DRectShadow', 'samplerBuffer', 'isamplerBuffer',
> 'usamplerBuffer']
> for stage in ['vs', 'gs', 'fs']:
> @@ -1445,7 +1445,7 @@ for draw in ['', 'indexed']:
> add_concurrent_test(spec['glsl-1.50'],
> ('arb_geometry_shader4-ignore-adjacent-vertices '
> 'core {0} {1}').format(draw, prim))
> -spec['glsl-1.50']['built-in constants'] = PiglitGLTest('built-in-constants '
> + os.path.join(testsDir, 'spec/glsl-1.50/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['glsl-1.50']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/glsl-1.50/minimum-maximums.txt')], run_concurrent=True)
> spec['glsl-1.50']['gs-emits-too-few-verts'] =
> PiglitGLTest('glsl-1.50-gs-emits-too-few-verts', run_concurrent=True)
> spec['glsl-1.50']['gs-end-primitive-optional-with-points-out'] =
> PiglitGLTest('glsl-1.50-geometry-end-primitive-optional-with-points-out',
> run_concurrent=True)
> spec['glsl-1.50']['getshaderiv-may-return-GS'] =
> PiglitGLTest('glsl-1.50-getshaderiv-may-return-GS', run_concurrent=True)
> @@ -1507,7 +1507,7 @@ for output_layout in ['points', 'lines',
> 'lines_adjacency', 'triangles',
> output_layout))
>
> spec['glsl-3.30'] = {}
> -spec['glsl-3.30']['built-in constants'] = PiglitGLTest('built-in-constants '
> + os.path.join(testsDir, 'spec/glsl-3.30/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['glsl-3.30']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/glsl-3.30/minimum-maximums.txt')], run_concurrent=True)
>
> import_glsl_parser_tests(spec['glsl-3.30'],
> os.path.join(testsDir, 'spec', 'glsl-3.30'),
> @@ -1525,7 +1525,7 @@ add_shader_test_dir(spec['glsl-es-3.00'],
> os.path.join(testsDir, 'spec', 'glsl-es-3.00'),
> recursive=True)
> add_concurrent_test(spec['glsl-es-3.00']['execution'],
> 'varying-struct-centroid_gles3')
> -spec['glsl-es-3.00']['built-in constants'] =
> PiglitGLTest('built-in-constants_gles3 ' + os.path.join(testsDir,
> 'spec/glsl-es-3.00/minimum-maximums.txt'), run_concurrent=True)
> +spec['glsl-es-3.00']['built-in constants'] =
> PiglitGLTest(['built-in-constants_gles3', os.path.join(testsDir,
> 'spec/glsl-es-3.00/minimum-maximums.txt')], run_concurrent=True)
>
> # AMD_performance_monitor
> profile.test_list['spec/AMD_performance_monitor/api'] =
> PiglitGLTest('amd_performance_monitor_api')
> @@ -2179,7 +2179,7 @@ arb_shading_language_420pack['execution'] = {}
> add_shader_test_dir(arb_shading_language_420pack['execution'],
> os.path.join(testsDir, 'spec',
> 'arb_shading_language_420pack', 'execution'),
> recursive=True)
> -spec['ARB_shading_language_420pack']['built-in constants'] =
> PiglitGLTest('built-in-constants ' + os.path.join(testsDir,
> 'spec/arb_shading_language_420pack/minimum-maximums.txt'),
> run_concurrent=True)
> +spec['ARB_shading_language_420pack']['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/arb_shading_language_420pack/minimum-maximums.txt')],
> run_concurrent=True)
> spec['ARB_shading_language_420pack']['multiple layout qualifiers'] =
> PiglitGLTest('arb_shading_language_420pack-multiple-layout-qualifiers',
> run_concurrent=True)
>
> # Group ARB_explicit_attrib_location
> @@ -3681,7 +3681,7 @@ add_shader_test_dir(spec['ARB_compute_shader'],
> import_glsl_parser_tests(spec['ARB_compute_shader'],
> os.path.join(testsDir, 'spec',
> 'arb_compute_shader'),
> ['compiler'])
> -arb_compute_shader['built-in constants'] = PiglitGLTest('built-in-constants
> ' + os.path.join(testsDir, 'spec/arb_compute_shader/minimum-maximums.txt'),
> run_concurrent=True)
> +arb_compute_shader['built-in constants'] =
> PiglitGLTest(['built-in-constants', os.path.join(testsDir,
> 'spec/arb_compute_shader/minimum-maximums.txt')], run_concurrent=True)
>
> # group glslparsertest ------------------------------------------------------
> glslparsertest = {}
> --
> 1.9.1
>
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
