summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJon Nordby <jononor@gmail.com>2015-01-20 23:28:01 +0100
committerJon Nordby <jononor@gmail.com>2015-01-20 23:43:02 +0100
commitcbfbceb9222a073b1c8bc28018129131fb95b0bd (patch)
tree4cf66a52cd9f212810a0e75d32542fc50f3b1165 /tests
parent9d69abf93dbc0ee64aa67ede73228a7abaefc2ac (diff)
tests: Also load operation from source dir
When building out-of-tree (VPATH build), like during distcheck the tests where not finding the .json ops becaue they were not built - and thus not present in the build directory
Diffstat (limited to 'tests')
-rwxr-xr-xtests/compositions/run-compositions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/compositions/run-compositions.py b/tests/compositions/run-compositions.py
index de965526..00291caa 100755
--- a/tests/compositions/run-compositions.py
+++ b/tests/compositions/run-compositions.py
@@ -54,7 +54,7 @@ class Context():
test_env = os.environ.copy()
test_env["GEGL_SWAP"] = "RAM"
- test_env["GEGL_PATH"] = os.path.join(self.build_dir, "operations")
+ test_env["GEGL_PATH"] = os.path.join(self.build_dir, "operations")+os.pathsep+os.path.join(self.src_dir, "operations")
self.opencl_available = not subprocess.call(self.detect_opencl_bin, stdout=FNULL, env=test_env)
self.ref_dir = os.path.join(self.src_dir, "tests", "compositions", "reference")
@@ -88,7 +88,7 @@ class Context():
if not use_opencl:
test_env["GEGL_USE_OPENCL"] = "no"
test_env["GEGL_SWAP"] = "RAM"
- test_env["GEGL_PATH"] = os.path.join(self.build_dir, "operations")
+ test_env["GEGL_PATH"] = os.path.join(self.build_dir, "operations")+os.pathsep+os.path.join(self.src_dir, "operations")
img_cmp_env = test_env.copy()
img_cmp_env["GEGL_USE_OPENCL"] = "no"