diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-01 12:20:48 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-05-01 12:20:48 -0700 |
| commit | 22b3c197d2461814ddd620cc20e0a1d7d453c0d9 (patch) | |
| tree | fbd80a99ab2a3756280b6111dc27269a6e809cac | |
| parent | f8c149bb78fbacf0b4d191646243b0401c052578 (diff) | |
all.tests: Do a global import_glsl_parser_tests for generated_tests/spec/
We don't have extensions under there, so no per-directory name
mangling is required. Now people doing new tests (like my 1.40 stuff)
don't need to remember to add the directory.
| -rw-r--r-- | tests/all.tests | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/all.tests b/tests/all.tests index b2ff7b56c..7d3d239d9 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -887,9 +887,6 @@ spec['glsl-1.10'] = Group() import_glsl_parser_tests(spec['glsl-1.10'], os.path.join(testsDir, 'spec', 'glsl-1.10'), ['preprocessor', 'compiler']) -import_glsl_parser_tests(spec['glsl-1.10'], - os.path.join(generatedTestDir, 'spec', 'glsl-1.10'), - ['preprocessor', 'compiler']) spec['glsl-1.10']['linker'] = Group() add_shader_test_dir(spec['glsl-1.10']['linker'], os.path.join(testsDir, 'spec', 'glsl-1.10', 'linker'), @@ -910,9 +907,6 @@ spec['glsl-1.20'] = Group() import_glsl_parser_tests(spec['glsl-1.20'], os.path.join(testsDir, 'spec', 'glsl-1.20'), ['preprocessor', 'compiler']) -import_glsl_parser_tests(spec['glsl-1.20'], - os.path.join(generatedTestDir, 'spec', 'glsl-1.20'), - ['compiler']) spec['glsl-1.20']['execution'] = Group() add_shader_test_dir(spec['glsl-1.20']['execution'], os.path.join(testsDir, 'spec', 'glsl-1.20', 'execution'), @@ -950,9 +944,6 @@ spec['glsl-1.30'] = Group() import_glsl_parser_tests(spec['glsl-1.30'], os.path.join(testsDir, 'spec', 'glsl-1.30'), ['preprocessor', 'compiler']) -import_glsl_parser_tests(spec['glsl-1.30'], - os.path.join(generatedTestDir, 'spec', 'glsl-1.30'), - ['compiler']) spec['glsl-1.30']['execution'] = Group() textureSize_samplers_130 = ['sampler1D', 'sampler2D', 'sampler3D', 'samplerCube', 'sampler1DShadow', 'sampler2DShadow', 'samplerCubeShadow', 'sampler1DArray', 'sampler2DArray', 'sampler1DArrayShadow', 'sampler2DArrayShadow', 'isampler1D', 'isampler2D', 'isampler3D', 'isamplerCube', 'isampler1DArray', 'isampler2DArray', 'usampler1D', 'usampler2D', 'usampler3D', 'usamplerCube', 'usampler1DArray', 'usampler2DArray'] @@ -2185,6 +2176,7 @@ add_asmparsertest('ARBvp1.0', 'xpd.txt') add_shader_test_dir(spec, os.path.join(generatedTestDir, 'spec'), recursive=True) +import_glsl_parser_tests(profile.tests, generatedTestDir, ['spec']) profile.tests['bugs'] = bugs profile.tests['general'] = general |