diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-24 17:14:07 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-24 17:14:07 -0500 |
| commit | d2faf5d25a0f6cc3ccaaf450fe6d3585fef058b7 (patch) | |
| tree | 5f569ad86c3a34efec088a69f7e7a31dff20a691 /indra/cmake/LLTestCommand.cmake | |
| parent | 4edf93d6d991af3f1aa0aba764388ad52ab1464b (diff) | |
Get rid of indra/llcommon/tests/setpython.py.
run_build_test.py already has the capability to set environment variables, and
we may as well direct it to set PYTHON to the running Python interpreter. That
completely eliminates one level of process wrapper.
Diffstat (limited to 'indra/cmake/LLTestCommand.cmake')
| -rw-r--r-- | indra/cmake/LLTestCommand.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake index b5a0580a90..f75c23a5de 100644 --- a/indra/cmake/LLTestCommand.cmake +++ b/indra/cmake/LLTestCommand.cmake @@ -9,6 +9,9 @@ MACRO(LL_TEST_COMMAND OUTVAR LD_LIBRARY_PATH) FOREACH(dir ${LD_LIBRARY_PATH}) LIST(APPEND value "-l${dir}") ENDFOREACH(dir) + # Enough different tests want to be able to find CMake's PYTHON_EXECUTABLE + # that we should just pop it into the environment for everybody. + LIST(APPEND value "-DPYTHON=${PYTHON_EXECUTABLE}") LIST(APPEND value ${ARGN}) SET(${OUTVAR} ${value}) ##IF(LL_TEST_VERBOSE) |