Author: labath Date: Wed Mar 1 04:08:44 2017 New Revision: 296593 URL: http://llvm.org/viewvc/llvm-project?rev=296593&view=rev Log: test: pass correct objcopy and ar paths to the test runner
Summary: The test runner has code to autodetect this, but it's not very smart -- in particular, it fails in the case where we build the test executables with the just-built clang. Since cmake already has the knowledge about the right toolchain, we can just have it pass the appropriate flags to the test runner. This also removes the "temporary" cache-scrubbing hack added a couple months ago. Reviewers: zturner, beanz Subscribers: mgorny, lldb-commits Differential Revision: https://reviews.llvm.org/D30453 Modified: lldb/trunk/test/CMakeLists.txt Modified: lldb/trunk/test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=296593&r1=296592&r2=296593&view=diff ============================================================================== --- lldb/trunk/test/CMakeLists.txt (original) +++ lldb/trunk/test/CMakeLists.txt Wed Mar 1 04:08:44 2017 @@ -43,11 +43,6 @@ set(LLDB_TEST_ARCH ${LLDB_DEFAULT_TEST_ARCH} CACHE STRING "Specify the architecture to run LLDB tests as (x86|x64). Determines whether tests are compiled with -m32 or -m64") -# Scrub LLDB_TEST_COMPILER out of the CMake caches -# TODO: remove the replace lines and the FORCE parameter in a few days once the -# change has made its way through bots to clean up their CMake caches. -string(REPLACE "-C;${LLDB_TEST_COMPILER}" "" LLDB_TEST_USER_ARGS_New "${LLDB_TEST_USER_ARGS}") - if(LLDB_TEST_CLANG) set(LLDB_TEST_COMPILER $<TARGET_FILE:clang>) endif() @@ -97,6 +92,11 @@ if(LLDB_BUILD_FRAMEWORK) list(APPEND LLDB_TEST_COMMON_ARGS --framework $<TARGET_FILE_DIR:liblldb>) endif() +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin") + list(APPEND LLDB_TEST_COMMON_ARGS + --env ARCHIVER=${CMAKE_AR} --env OBJCOPY=${CMAKE_OBJCOPY}) +endif() + add_python_test_target(check-lldb-single ${LLDB_SOURCE_DIR}/test/dotest.py "--no-multiprocess;${LLDB_TEST_COMMON_ARGS};${LLDB_TEST_USER_ARGS}" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
