summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests/testrunner.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-05 17:01:38 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-05 17:01:38 -0500
commit05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (patch)
tree70ae80b97c738ceee3b4ba530454e97a8698b6cb /indra/llmessage/tests/testrunner.py
parent68413474c4479eee9bdbeb34ea131475ba1d646e (diff)
parent4ca084f7a06acc4ef861c1f4df2f857f8836b85e (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llmessage/tests/testrunner.py')
-rwxr-xr-xindra/llmessage/tests/testrunner.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmessage/tests/testrunner.py b/indra/llmessage/tests/testrunner.py
index 5b9beb359b..9a2de71142 100755
--- a/indra/llmessage/tests/testrunner.py
+++ b/indra/llmessage/tests/testrunner.py
@@ -168,7 +168,10 @@ def run(*args, **kwds):
# executable passed as our first arg,
# - [no e] child should inherit this process's environment.
debug("Running %s...", " ".join(args))
- rc = os.spawnv(os.P_WAIT, args[0], args)
+ if kwds.get("use_path", False):
+ rc = os.spawnvp(os.P_WAIT, args[0], args)
+ else:
+ rc = os.spawnv(os.P_WAIT, args[0], args)
debug("%s returned %s", args[0], rc)
return rc