[Piglit] [PATCH] tests/py_modules/constants.py: look for generated_tests in build dir

Brian Paul brianp at vmware.com
Fri Apr 7 18:41:10 UTC 2017


If piglit is built out of source (such as in a top-level build/ directory),
the generated shader tests will be in build/generated_tests/.  This patch
checks if PIGLIT_BUILD_DIR is set, and if so, looks for generated_tests/ in
that directory.
---
 tests/py_modules/constants.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/py_modules/constants.py b/tests/py_modules/constants.py
index a4e7fb3..d4a15bf 100644
--- a/tests/py_modules/constants.py
+++ b/tests/py_modules/constants.py
@@ -28,8 +28,16 @@ import sys
 import subprocess
 
 TESTS_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-GENERATED_TESTS_DIR = os.path.abspath(
-    os.path.join(TESTS_DIR, '..', 'generated_tests'))
+
+if 'PIGLIT_BUILD_DIR' in os.environ:
+    # The generated tests will be in the build dir
+    GENERATED_TESTS_DIR = os.path.abspath(
+        os.path.join(os.environ['PIGLIT_BUILD_DIR'], 'generated_tests'))
+else:
+    # The generated tests will be in the source dir
+    GENERATED_TESTS_DIR = os.path.abspath(
+        os.path.join(TESTS_DIR, '..', 'generated_tests'))
+
 
 # If on cygwin convert to a dos style path
 if sys.platform == 'cygwin':
-- 
1.9.1



More information about the Piglit mailing list