[Piglit] [Patch v2 4/4] oglconform.py: Use config file instead of symlink

Dylan Baker baker.dylan.c at gmail.com
Mon Jul 7 16:20:38 PDT 2014


v2: - change bindir to path (chadv)

Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
---
 piglit.conf.example | 4 ++++
 tests/oglconform.py | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/piglit.conf.example b/piglit.conf.example
index 8ebef8f..61a28cf 100644
--- a/piglit.conf.example
+++ b/piglit.conf.example
@@ -10,3 +10,7 @@
 [igt]
 ; Set bindir equal to the absolute root of the igt directory
 ;path=/home/user/src/igt
+
+[oglconform]
+; Set bindir equal to the absolute root of the oglconform directory
+;path=/home/usr/src/oglconform
diff --git a/tests/oglconform.py b/tests/oglconform.py
index 1d40d2a..fab1946 100644
--- a/tests/oglconform.py
+++ b/tests/oglconform.py
@@ -26,13 +26,14 @@ import re
 import sys
 import subprocess
 
+import framework.core
 from framework.profile import TestProfile
-from framework.exectest import Test, TEST_BIN_DIR
+from framework.exectest import Test
 from os import path
 
 __all__ = ['profile']
 
-bin_oglconform = path.join(TEST_BIN_DIR, 'oglconform')
+bin_oglconform = framework.core.PIGLIT_CONFIG.get('oglconform', 'path')
 
 if not os.path.exists(bin_oglconform):
     sys.exit(0)
-- 
2.0.0



More information about the Piglit mailing list