diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2018-09-27 19:55:54 -0700 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2018-10-04 16:42:22 -0700 |
| commit | c4bc3727056b6a5acf7e48919839668e9d6d4471 (patch) | |
| tree | 29d83a3be507e6f729bb2c3eab8fc6daa24aa8d4 /tests | |
| parent | bdc56a5b1df476a81ec2b2c6520faeb41a105ec1 (diff) | |
sanity: Support generated shader tests
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.no_api.txt | 2 | ||||
| -rw-r--r-- | tests/sanity.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/CMakeLists.no_api.txt b/tests/CMakeLists.no_api.txt index 632c6786a..455b059d8 100644 --- a/tests/CMakeLists.no_api.txt +++ b/tests/CMakeLists.no_api.txt @@ -61,7 +61,7 @@ add_custom_target(gen-gl-xml) piglit_generate_xml(opengl opengl gen-gl-xml "") piglit_generate_xml(quick_gl quick_gl gen-gl-xml "") piglit_generate_xml(llvmpipe_gl llvmpipe_gl gen-gl-xml "") -piglit_generate_xml(sanity sanity gen-gl-xml "") +piglit_generate_xml(sanity sanity gen-gl-xml "" gen-gl-tests) add_custom_target(gen-gl-gen-xml) piglit_generate_xml(glslparser glslparser gen-gl-gen-xml "" gen-gl-tests static-glslparser-tests static-asmparser-tests) diff --git a/tests/sanity.py b/tests/sanity.py index ed3aba004..0011000a2 100644 --- a/tests/sanity.py +++ b/tests/sanity.py @@ -49,8 +49,13 @@ gen_basepath = os.path.relpath(os.path.join(GENERATED_TESTS_DIR, '..'), basepath def add_shader_test(shader): """Given an adder, creates a group and adds a shader test.""" - basedir = TESTS_DIR - abs_path = os.path.abspath(os.path.join(basedir, shader)) + for d in (TESTS_DIR, GENERATED_TESTS_DIR,): + s = os.path.abspath(os.path.join(d, shader)) + if os.path.exists(s): + basedir = d + abs_path = s + break + dirpath, filename = os.path.split(os.path.join(basedir, shader)) dirname = os.path.relpath(dirpath, basepath) filepath = os.path.join(dirname, filename) |