diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2015-01-26 15:55:10 -0800 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2015-03-05 09:46:47 -0800 |
| commit | d79077fea1f47d37cabf5d5484177147901cb041 (patch) | |
| tree | b3e4f2e437bc43f94abd9da4cc9fdd34b196c765 | |
| parent | 279e0909d95780d126b33cc01af01c3026513a5d (diff) | |
cl.py: Use flat list for program test dirs
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
TODO: tests this..
| -rw-r--r-- | tests/cl.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/cl.py b/tests/cl.py index d72e3df1c..6ac1e75ba 100644 --- a/tests/cl.py +++ b/tests/cl.py @@ -15,6 +15,7 @@ import glob from framework.profile import TestProfile from framework.test import PiglitCLTest +from framework import grouptools from .py_modules.constants import TESTS_DIR, GENERATED_TESTS_DIR __all__ = ['profile'] @@ -116,30 +117,30 @@ def add_program_test_dir(group, dirpath): if ext not in ['.cl', '.program_test']: continue - group[testname] = cl_test( + profile.test_list[grouptools.join(group, testname)] = cl_test( ['cl-program-tester', os.path.join(dirpath, filename)]) -add_program_test_dir(profile.tests['Program']["Build"], +add_program_test_dir(grouptools.join('program', 'build'), os.path.join(TESTS_DIR, 'cl', 'program', 'build')) -add_program_test_dir(profile.tests['Program']["Build"]['fail'], +add_program_test_dir(grouptools.join('program', 'build', 'fail'), os.path.join(TESTS_DIR, 'cl', 'program', 'build', 'fail')) -add_program_test_dir(profile.tests['Program']["execute"], +add_program_test_dir(grouptools.join('program', 'execute'), os.path.join(TESTS_DIR, 'cl', 'program', 'execute')) -add_program_test_dir(profile.tests['Program']["execute"], +add_program_test_dir(grouptools.join('program', 'execute'), os.path.join(TESTS_DIR, 'cl', 'program', 'execute', 'builtin', 'atomic')) -add_program_test_dir(profile.tests['Program']["execute"], +add_program_test_dir(grouptools.join('program', 'execute'), os.path.join(TESTS_DIR, 'cl', 'program', 'execute', 'builtin', 'convert')) # Run generated built-in tests -add_program_test_dir(profile.tests['Program']["execute"]["Builtin"], +add_program_test_dir(grouptools.join('program', 'execute', 'builtin'), os.path.join(GENERATED_TESTS_DIR, 'cl', 'builtin', 'int')) -add_program_test_dir(profile.tests['Program']["execute"]["Builtin"], +add_program_test_dir(grouptools.join('program', 'execute', 'builtin'), os.path.join(GENERATED_TESTS_DIR, 'cl', 'builtin', 'math')) -add_program_test_dir(profile.tests['Program']["execute"]["Builtin"], +add_program_test_dir(grouptools.join('program', 'execute', 'builtin'), os.path.join(GENERATED_TESTS_DIR, 'cl', 'builtin', 'relational')) -add_program_test_dir(profile.tests['program']["Execute"]["Store"], +add_program_test_dir(grouptools.join('program', 'execute', 'store'), os.path.join(GENERATED_TESTS_DIR, 'cl', 'store')) |