summaryrefslogtreecommitdiff
path: root/tests/cl.py
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2015-01-12 00:22:28 -0800
committerDylan Baker <baker.dylan.c@gmail.com>2015-01-19 09:22:51 -0800
commiteae44f73d173b26d300ceb4d262a2d56861a353d (patch)
tree42b64de55100740611cd08be64ec55dc19c156ef /tests/cl.py
parent8f85b6632ea11bab4e300f698fba40f4ecf08bc6 (diff)
cl.py: use os.path.join for paths
This was done in all.py, and as the advantage of making piglit more cross platform safe. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Acked-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'tests/cl.py')
-rw-r--r--tests/cl.py30
1 files changed, 21 insertions, 9 deletions
diff --git a/tests/cl.py b/tests/cl.py
index 4c44b9fdb..897d99adf 100644
--- a/tests/cl.py
+++ b/tests/cl.py
@@ -113,18 +113,30 @@ program["Build"] = program_build
program["Build"]["Fail"] = program_build_fail
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')
-add_program_test_dir(program_execute, 'tests/cl/program/execute/builtin/atomic')
-add_program_test_dir(program_execute, 'tests/cl/program/execute/builtin/convert')
+add_program_test_dir(program_build,
+ os.path.join('tests', 'cl', 'program', 'build'))
+add_program_test_dir(program_build_fail,
+ os.path.join('tests', 'cl', 'program', 'build', 'fail'))
+add_program_test_dir(program_execute,
+ os.path.join('tests', 'cl', 'program', 'execute'))
+add_program_test_dir(program_execute,
+ os.path.join('tests', 'cl', 'program', 'execute',
+ 'builtin', 'atomic'))
+add_program_test_dir(program_execute,
+ os.path.join('tests', 'cl', 'program', 'execute',
+ 'builtin', 'convert'))
#Run generated built-in tests
program_execute_builtin = {}
program["Execute"]["Builtin"] = program_execute_builtin
-add_program_test_dir(program_execute_builtin, 'generated_tests/cl/builtin/int')
-add_program_test_dir(program_execute_builtin, 'generated_tests/cl/builtin/math')
-add_program_test_dir(program_execute_builtin, 'generated_tests/cl/builtin/relational')
+add_program_test_dir(program_execute_builtin,
+ os.path.join('generated_tests', 'cl', 'builtin', 'int'))
+add_program_test_dir(program_execute_builtin,
+ os.path.join('generated_tests', 'cl', 'builtin', 'math'))
+add_program_test_dir(program_execute_builtin,
+ os.path.join('generated_tests', 'cl', 'builtin',
+ 'relational'))
program_execute_store = {}
program["Execute"]["Store"] = program_execute_store
-add_program_test_dir(program_execute_store, 'generated_tests/cl/store')
+add_program_test_dir(program_execute_store,
+ os.path.join('generated_tests', 'cl', 'store'))