diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-09 11:56:47 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-09 11:56:47 -0400 |
| commit | 2291d5a9becd3b851f77c0fbdb07969946f1dd02 (patch) | |
| tree | d80659707adc084dbde8c442849adfcf5dcc1387 /indra | |
| parent | 44d7267cd9bddfe0e5e382db5f1d5a83a832b6ff (diff) | |
Fixed indra test dynamic library issues.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/test/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 708ceeac42..86cf153610 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -38,7 +38,7 @@ set(test_SOURCE_FILES lldoubledispatch_tut.cpp llevents_tut.cpp llhttpdate_tut.cpp - llhttpclient_tut.cpp +# llhttpclient_tut.cpp # Segfaults, disabled. llhttpnode_tut.cpp lliohttpserver_tut.cpp llmessageconfig_tut.cpp @@ -117,16 +117,21 @@ endif (WINDOWS) get_target_property(TEST_EXE test LOCATION) -SET_TEST_PATH(LD_LIBRARY_PATH) -LL_TEST_COMMAND(command "${LD_LIBRARY_PATH}" - "${TEST_EXE}" "--output=${CMAKE_CURRENT_BINARY_DIR}/cpp_test_results.txt" "--touch=${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt") +SET_TEST_PATH(DYLD_LIBRARY_PATH) + +LL_TEST_COMMAND(command + "${DYLD_LIBRARY_PATH}" + "${TEST_EXE}" + "--output=${CMAKE_CURRENT_BINARY_DIR}/cpp_test_results.txt" + "--touch=${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt") + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt COMMAND ${command} DEPENDS test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "C++ unit tests" - ) + ) set(test_results ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt) |