diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:08:44 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:08:44 -0700 |
| commit | 52708727f4bd1bf98d0ee727a15689e7c65d965d (patch) | |
| tree | daf0e802de6abf26c098a3510d9cef40bb866218 /indra/llcommon | |
| parent | a6ff5974c36f8ea860b2065c549333d8cfc6a458 (diff) | |
| parent | 3e5819d86226d6b3d5fbd24db701c6f57f607b39 (diff) | |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index a93623d24e..bc4e44d7e6 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -236,13 +236,13 @@ target_link_libraries( include(LLAddBuildTest) SET(llcommon_TEST_SOURCE_FILES - # WARNING: Please don't write tests against LLCommon or LLMath until this issue is resolved: https://jira.lindenlab.com/jira/browse/DEV-29456 - # lllazy.cpp ) LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) +# Have to treat lllazy test as an integration test until this issue is resolved: +# https://jira.lindenlab.com/jira/browse/DEV-29456 LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. |