[Piglit] [PATCH 29/34] cl tests: move non-generated tests out of the generated tests dir

[Michel Dänzer]

Hi Dylan,


On 21.02.2015 11:18, Dylan Baker wrote:
> It really doesn't make sense to have static tests in the generated tests
> directory, this patch adds them to the tests directory and adds the
> appropriate code to cl.py for this change
> 
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  tests/cl.py                                                  | 2 ++
>  {generated_tests => tests}/cl/store/store-kernels-global.inc | 0
>  {generated_tests => tests}/cl/store/store-kernels-local.inc  | 0
>  3 files changed, 2 insertions(+)
>  rename {generated_tests => tests}/cl/store/store-kernels-global.inc (100%)
>  rename {generated_tests => tests}/cl/store/store-kernels-local.inc (100%)
> 
> diff --git a/tests/cl.py b/tests/cl.py
> index 06301af..bc7c63f 100644
> --- a/tests/cl.py
> +++ b/tests/cl.py
> @@ -167,3 +167,5 @@ program_execute_store = {}
>  program["Execute"]["Store"] = program_execute_store
>  add_program_test_dir(program_execute_store,
>                       os.path.join(GENERATED_TESTS_DIR, 'cl', 'store'))
> +add_program_test_dir(program_execute_store,
> +                     os.path.join(TESTS_DIR, 'cl', 'store'))
> diff --git a/generated_tests/cl/store/store-kernels-global.inc b/tests/cl/store/store-kernels-global.inc
> similarity index 100%
> rename from generated_tests/cl/store/store-kernels-global.inc
> rename to tests/cl/store/store-kernels-global.inc
> diff --git a/generated_tests/cl/store/store-kernels-local.inc b/tests/cl/store/store-kernels-local.inc
> similarity index 100%
> rename from generated_tests/cl/store/store-kernels-local.inc
> rename to tests/cl/store/store-kernels-local.inc
> 

This change broke some CL tests:

Program source file
/home/daenzer/src/piglit-git/piglit/generated_tests/cl/store/store-kernels-global.inc
does not exists or is empty

I'm working around this for now with these symlinks:

generated_tests/cl/store/store-kernels-global.inc: symbolic link to
../../../tests/cl/store/store-kernels-global.inc
generated_tests/cl/store/store-kernels-local.inc:  symbolic link to
../../../tests/cl/store/store-kernels-local.inc


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer