summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@intel.com>2011-03-09 13:11:06 -0800
committerChad Versace <chad.versace@intel.com>2011-03-12 10:03:09 -0800
commit301e39502dce237660fbc45fcfd5879bd6161194 (patch)
tree340e43c449087a61ab06fea1cbf355b22e3a185f
parent161b08b7404c3573bcea071d571faaf3bdd688ec (diff)
framework: Support running Piglit with an out-of-tree build
To run Piglit with an out-of-tree build, set the environment variable PIGLIT_BUILD_DIR. For example: $ env PIGLIT_BUILD_DIR=/path/to/piglit/build/dir \ ./piglit-run.py tests/sanity.tests results/sanity.results Signed-off-by: Chad Versace <chad.versace@intel.com>
-rw-r--r--README8
-rw-r--r--framework/core.py5
2 files changed, 11 insertions, 2 deletions
diff --git a/README b/README
index e9755d64a..b7be92647 100644
--- a/README
+++ b/README
@@ -56,7 +56,13 @@ Make sure that everything is set up correctly:
$ ./piglit-run.py tests/sanity.tests results/sanity.results
-This will run some minimal tests. Use
+This will run some minimal tests. If you built Piglit out-of-source, then the
+environment variable PIGLIT_BUILD_DIR must be set:
+
+ $ env PIGLIT_BUILD_DIR=/path/to/piglit/build/dir \
+ ./piglit-run.py tests/sanity.tests results/sanity.results
+
+Use
$ ./piglit-run.py
diff --git a/framework/core.py b/framework/core.py
index 58b629278..ee7e6eb1a 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -80,7 +80,10 @@ def encode(text):
def decode(text):
return text.decode("string_escape")
-testBinDir = os.path.dirname(__file__) + '/../bin/'
+if 'PIGLIT_BUILD_DIR' in os.environ:
+ testBinDir = os.environ['PIGLIT_BUILD_DIR'] + '/bin/'
+else:
+ testBinDir = os.path.dirname(__file__) + '/../bin/'
#############################################################################