Commit 443abf5a authored by Dylan Baker's avatar Dylan Baker

igt: use piglit.conf instead of a symlink

Instead of symlinking igt into the bin/ directory, edit piglit.conf and
set the path key in the igt section to the root of intel-gpu-tools

v2: - change config key 'bindir' to 'path' (chadv)
Reviewed-by: default avatarChad Versace <chad.versace@linux.intel.com>
Signed-off-by: Dylan Baker's avatarDylan Baker <baker.dylan.c@gmail.com>
parent 27556761
...@@ -6,3 +6,7 @@ ...@@ -6,3 +6,7 @@
[xts] [xts]
; Set bindir equal to the root of the xts directory ; Set bindir equal to the root of the xts directory
;path=/home/user/src/xts ;path=/home/user/src/xts
[igt]
; Set bindir equal to the absolute root of the igt directory
;path=/home/user/src/igt
...@@ -33,8 +33,9 @@ import errno ...@@ -33,8 +33,9 @@ import errno
from datetime import datetime from datetime import datetime
from os import path from os import path
import framework.core
from framework.profile import TestProfile from framework.profile import TestProfile
from framework.exectest import Test, TEST_BIN_DIR from framework.exectest import Test
__all__ = ['profile'] __all__ = ['profile']
...@@ -67,12 +68,9 @@ def checkEnvironment(): ...@@ -67,12 +68,9 @@ def checkEnvironment():
if 'IGT_TEST_ROOT' in os.environ: if 'IGT_TEST_ROOT' in os.environ:
igtTestRoot = os.environ['IGT_TEST_ROOT'] igtTestRoot = os.environ['IGT_TEST_ROOT']
else: else:
# Chase the piglit/bin/igt symlink to find where the tests really live. igtTestRoot = os.path.join(framework.core.PIGLIT_CONFIG.get('igt', 'path'),
if os.path.exists(path.join(TEST_BIN_DIR, 'igt')): 'tests')
igtTestRoot = path.join(path.realpath(path.join(TEST_BIN_DIR, 'igt')), assert os.path.exists(igtTestRoot)
'tests')
else:
igtTestRoot = ''
# check for the test lists # check for the test lists
if not (os.path.exists(os.path.join(igtTestRoot, 'single-tests.txt')) if not (os.path.exists(os.path.join(igtTestRoot, 'single-tests.txt'))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment