This revision was automatically updated to reflect the committed changes. Closed by commit rL296593: test: pass correct objcopy and ar paths to the test runner (authored by labath).
Changed prior to commit: https://reviews.llvm.org/D30453?vs=90008&id=90134#toc Repository: rL LLVM https://reviews.llvm.org/D30453 Files: lldb/trunk/test/CMakeLists.txt Index: lldb/trunk/test/CMakeLists.txt =================================================================== --- lldb/trunk/test/CMakeLists.txt +++ lldb/trunk/test/CMakeLists.txt @@ -43,11 +43,6 @@ ${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 @@ 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}"
Index: lldb/trunk/test/CMakeLists.txt =================================================================== --- lldb/trunk/test/CMakeLists.txt +++ lldb/trunk/test/CMakeLists.txt @@ -43,11 +43,6 @@ ${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 @@ 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