Skip to content
Snippets Groups Projects
Commit 7db4992f authored by Adam Moss's avatar Adam Moss
Browse files

DEV-41081 turn llstring_tut into a real llcommon unit (well, integration :() test.

parent 5787d576
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
project(llcommon) project(llcommon)
include(00-Common) include(00-Common)
include(LLAddBuildTest)
include(LLCommon) include(LLCommon)
include(Boost) include(Boost)
...@@ -224,8 +223,7 @@ set_source_files_properties(${llcommon_HEADER_FILES} ...@@ -224,8 +223,7 @@ set_source_files_properties(${llcommon_HEADER_FILES}
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
add_library (llcommon ${llcommon_SOURCE_FILES}) add_library (llcommon ${llcommon_SOURCE_FILES})
target_link_libraries( target_link_libraries(llcommon
llcommon
${APRUTIL_LIBRARIES} ${APRUTIL_LIBRARIES}
${APR_LIBRARIES} ${APR_LIBRARIES}
${EXPAT_LIBRARIES} ${EXPAT_LIBRARIES}
...@@ -234,7 +232,8 @@ target_link_libraries( ...@@ -234,7 +232,8 @@ target_link_libraries(
${BOOST_REGEX_LIBRARY} ${BOOST_REGEX_LIBRARY}
) )
include(LLAddBuildTest) #add unit tests
INCLUDE(LLAddBuildTest)
SET(llcommon_TEST_SOURCE_FILES SET(llcommon_TEST_SOURCE_FILES
) )
LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
...@@ -244,6 +243,8 @@ set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) ...@@ -244,6 +243,8 @@ set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
# Have to treat lllazy test as an integration test until this issue is resolved: # Have to treat lllazy test as an integration test until this issue is resolved:
# https://jira.lindenlab.com/jira/browse/DEV-29456 # https://jira.lindenlab.com/jira/browse/DEV-29456
LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}")
# Also puzzled as to why *CMake* barfs when this is a *unit* test.
LL_ADD_INTEGRATION_TEST(llstring llstring.cpp "${test_libs}")
# *TODO - reenable these once tcmalloc libs no longer break the build. # *TODO - reenable these once tcmalloc libs no longer break the build.
#ADD_BUILD_TEST(llallocator llcommon) #ADD_BUILD_TEST(llallocator llcommon)
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment