From c56601bc22c591f4fabe084235aea2c0188e5af6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 26 Jun 2019 11:23:33 -0400
Subject: [PATCH] DRTVWR-476: Add LLCOREHTTP_TESTS CMake var, OFF by default on
Mac.
Hopefully this is temporary until we solve the problem of crashy llcorehttp
test executable on Mac.
---
indra/llcorehttp/CMakeLists.txt | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 7b6b2224efe..494f6642e0d 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -101,12 +101,20 @@ target_link_libraries(
)
# tests
-if (LL_TESTS)
+if (DARWIN)
+ # 2019-06-26: this test executable crashes on Mac trying to initialize std::atomic?!
+ set(LLCOREHTTP_TESTS_DFT OFF)
+else ()
+ set(LLCOREHTTP_TESTS_DFT ON)
+endif ()
+set(LLCOREHTTP_TESTS ${LLCOREHTTP_TESTS_DFT} CACHE BOOL
+ "Build and run llcorehttp integration tests specifically")
+if (LL_TESTS AND LLCOREHTTP_TESTS)
SET(llcorehttp_TEST_SOURCE_FILES
tests/test_allocator.cpp
)
- set(llcorehttp_TEST_HEADER_FILS
+ set(llcorehttp_TEST_HEADER_FILES
tests/test_httpstatus.hpp
tests/test_refcounted.hpp
tests/test_httpoperation.hpp
@@ -232,5 +240,4 @@ endif (DARWIN)
target_link_libraries(http_texture_load ${example_libs})
-endif (LL_TESTS)
-
+endif (LL_TESTS AND LLCOREHTTP_TESTS)
--
GitLab