aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Watry <awatry@gmail.com>2013-03-11 18:27:43 -0500
committerAaron Watry <awatry@gmail.com>2013-03-12 08:24:45 -0500
commitd7c7073f3e66d5a9607475e96ed52daaa01f0fdc (patch)
tree8e599a6850a5642a6ac22189aae35b6039e27836
parentb7184ad66af06f1f56857ee79982e347cd553eb8 (diff)
Plug the built-in test generator to the CL test list [v2]
v2: - Generate tests in the generated_tests directory tree at compile time
-rw-r--r--generated_tests/CMakeLists.txt4
-rw-r--r--tests/all_cl.tests5
2 files changed, 9 insertions, 0 deletions
diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt
index 694a2131..70ef0170 100644
--- a/generated_tests/CMakeLists.txt
+++ b/generated_tests/CMakeLists.txt
@@ -48,6 +48,9 @@ piglit_make_generated_tests(
uniform-initializer-templates/fs-initializer-set-by-other-stage.template
uniform-initializer-templates/vs-initializer-set-by-other-stage.template
)
+piglit_make_generated_tests(
+ builtin_cl_int_tests.list
+ generate-cl-int-builtins.py)
# Add a "gen-tests" target that can be used to generate all the
# tests without doing any other compilation.
@@ -55,6 +58,7 @@ add_custom_target(gen-tests ALL
DEPENDS builtin_packing_tests.list
builtin_uniform_tests.list
constant_array_size_tests.list
+ builtin_cl_int_tests.list
interpolation_tests.list
non-lvalue_tests.list
uniform-initializer_tests.list)
diff --git a/tests/all_cl.tests b/tests/all_cl.tests
index 267f9699..8cefa431 100644
--- a/tests/all_cl.tests
+++ b/tests/all_cl.tests
@@ -104,3 +104,8 @@ program["Execute"] = program_execute
add_program_test_dir(program_build, 'tests/cl/program/build')
add_program_test_dir(program_build_fail, 'tests/cl/program/build/fail')
add_program_test_dir(program_execute, 'tests/cl/program/execute')
+
+#Run generated built-in tests
+program_execute_builtin = Group()
+program["Execute"]["Builtin"] = program_execute_builtin
+add_program_test_dir(program_execute_builtin, 'generated_tests/cl/builtin/int') \ No newline at end of file