summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-04-03 14:12:16 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-05-01 14:29:08 -0700
commit7e9d859eb58ba40671c38186a7b79cd37f83e9b0 (patch)
tree2924b58a972e5864e9d9ac204063a8afd9cf4422
parentffc64348a8f518bcac495f4bb584260bc55ada91 (diff)
framework/test: make CLProgramTester take relative paths
Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
-rw-r--r--framework/test/piglit_test.py2
-rw-r--r--tests/cl.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py
index 4fd825ae7..6511e0f53 100644
--- a/framework/test/piglit_test.py
+++ b/framework/test/piglit_test.py
@@ -226,5 +226,5 @@ class CLProgramTester(PiglitCLTest):
@PiglitCLTest.command.getter
def command(self):
command = super(CLProgramTester, self).command
- command.insert(1, self.filename)
+ command.insert(1, os.path.join(ROOT_DIR, self.filename))
return command
diff --git a/tests/cl.py b/tests/cl.py
index 2ab350245..56b3fc18d 100644
--- a/tests/cl.py
+++ b/tests/cl.py
@@ -14,7 +14,7 @@ from __future__ import (
import os
from framework.profile import TestProfile
-from framework.test.piglit_test import PiglitCLTest, CLProgramTester
+from framework.test.piglit_test import PiglitCLTest, CLProgramTester, ROOT_DIR
from framework import grouptools
from .py_modules.constants import TESTS_DIR, GENERATED_TESTS_DIR
@@ -111,7 +111,7 @@ def add_program_test_dir(group, dirpath):
continue
profile.test_list[grouptools.join(group, testname)] = CLProgramTester(
- os.path.join(dirpath, filename))
+ os.path.join(os.path.relpath(dirpath, ROOT_DIR), filename))
add_program_test_dir(grouptools.join('program', 'build'),