diff options
| author | Zachary Turner <zturner@google.com> | 2015-03-17 22:51:21 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-03-17 22:51:21 +0000 |
| commit | 85bc48ca744bb531576109631df36355f64daee7 (patch) | |
| tree | 96909ecfbd10c84f8de1c51e697dbe60b9cb0441 | |
| parent | 0729afa4a6fc3c0bcfecd79672e2476e0380fb78 (diff) | |
| download | bcm5719-llvm-85bc48ca744bb531576109631df36355f64daee7.tar.gz bcm5719-llvm-85bc48ca744bb531576109631df36355f64daee7.zip | |
Convert CRLF to LF.
I accidentally let some Windows line endings slip in. This is a
good reminder for me to use core.eol=lf.
llvm-svn: 232560
| -rw-r--r-- | lldb/unittests/CMakeLists.txt | 46 | ||||
| -rw-r--r-- | lldb/unittests/Host/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | lldb/unittests/Interpreter/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | lldb/unittests/Plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/unittests/Plugins/Process/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | lldb/unittests/Plugins/Process/Linux/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | lldb/unittests/Utility/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | lldb/unittests/gtest_common.h | 64 |
8 files changed, 95 insertions, 95 deletions
diff --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt index 034920a857c..83c535a5de2 100644 --- a/lldb/unittests/CMakeLists.txt +++ b/lldb/unittests/CMakeLists.txt @@ -1,23 +1,23 @@ -add_custom_target(LLDBUnitTests)
-set_target_properties(LLDBUnitTests PROPERTIES FOLDER "LLDB tests")
-
-include_directories(${LLDB_SOURCE_ROOT})
-
-set(LLDB_GTEST_COMMON_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/gtest_common.h)
-if (MSVC)
- list(APPEND LLVM_COMPILE_FLAGS /FI ${LLDB_GTEST_COMMON_INCLUDE})
-else ()
- list(APPEND LLVM_COMPILE_FLAGS -include ${LLDB_GTEST_COMMON_INCLUDE})
-endif ()
-
-# add_lldb_unittest(test_dirname file1.cpp file2.cpp)
-#
-# Will compile the list of files together and link against
-function(add_lldb_unittest test_name)
- add_unittest(LLDBUnitTests ${test_name} ${ARGN})
-endfunction()
-
-add_subdirectory(Host)
-add_subdirectory(Interpreter)
-add_subdirectory(Plugins)
-add_subdirectory(Utility)
+add_custom_target(LLDBUnitTests) +set_target_properties(LLDBUnitTests PROPERTIES FOLDER "LLDB tests") + +include_directories(${LLDB_SOURCE_ROOT}) + +set(LLDB_GTEST_COMMON_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/gtest_common.h) +if (MSVC) + list(APPEND LLVM_COMPILE_FLAGS /FI ${LLDB_GTEST_COMMON_INCLUDE}) +else () + list(APPEND LLVM_COMPILE_FLAGS -include ${LLDB_GTEST_COMMON_INCLUDE}) +endif () + +# add_lldb_unittest(test_dirname file1.cpp file2.cpp) +# +# Will compile the list of files together and link against +function(add_lldb_unittest test_name) + add_unittest(LLDBUnitTests ${test_name} ${ARGN}) +endfunction() + +add_subdirectory(Host) +add_subdirectory(Interpreter) +add_subdirectory(Plugins) +add_subdirectory(Utility) diff --git a/lldb/unittests/Host/CMakeLists.txt b/lldb/unittests/Host/CMakeLists.txt index 7611c273a10..9d3f498d144 100644 --- a/lldb/unittests/Host/CMakeLists.txt +++ b/lldb/unittests/Host/CMakeLists.txt @@ -1,10 +1,10 @@ -add_lldb_unittest(HostTests
- SocketAddressTest.cpp
- SocketTest.cpp
- SocketTestMock.cpp
- )
-
-target_link_libraries(HostTests
- lldbBase
- ${PYTHON_LIBRARY}
- )
+add_lldb_unittest(HostTests + SocketAddressTest.cpp + SocketTest.cpp + SocketTestMock.cpp + ) + +target_link_libraries(HostTests + lldbBase + ${PYTHON_LIBRARY} + ) diff --git a/lldb/unittests/Interpreter/CMakeLists.txt b/lldb/unittests/Interpreter/CMakeLists.txt index ea69bf42426..9f09713d40c 100644 --- a/lldb/unittests/Interpreter/CMakeLists.txt +++ b/lldb/unittests/Interpreter/CMakeLists.txt @@ -1,8 +1,8 @@ -add_lldb_unittest(InterpreterTests
- TestArgs.cpp
- )
-
-target_link_libraries(InterpreterTests
- lldbInterpreter
- ${PYTHON_LIBRARY}
- )
+add_lldb_unittest(InterpreterTests + TestArgs.cpp + ) + +target_link_libraries(InterpreterTests + lldbInterpreter + ${PYTHON_LIBRARY} + ) diff --git a/lldb/unittests/Plugins/CMakeLists.txt b/lldb/unittests/Plugins/CMakeLists.txt index 422f203f227..d98183b914a 100644 --- a/lldb/unittests/Plugins/CMakeLists.txt +++ b/lldb/unittests/Plugins/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(Process)
+add_subdirectory(Process) diff --git a/lldb/unittests/Plugins/Process/CMakeLists.txt b/lldb/unittests/Plugins/Process/CMakeLists.txt index bf3426c02d0..9b4e784474c 100644 --- a/lldb/unittests/Plugins/Process/CMakeLists.txt +++ b/lldb/unittests/Plugins/Process/CMakeLists.txt @@ -1,3 +1,3 @@ -if (CMAKE_SYSTEM_NAME MATCHES "Linux")
- add_subdirectory(Linux)
-endif()
+if (CMAKE_SYSTEM_NAME MATCHES "Linux") + add_subdirectory(Linux) +endif() diff --git a/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt b/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt index 1a23eae8037..0acf22980bc 100644 --- a/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt +++ b/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt @@ -1,9 +1,9 @@ -add_lldb_unittest(ProcessLinuxTests
- ThreadStateCoordinatorTest.cpp
- ThreadStateCoordinatorTestMock.cpp
- )
-
-target_link_libraries(ProcessLinuxTests
- lldbBase
- ${PYTHON_LIBRARY}
- )
+add_lldb_unittest(ProcessLinuxTests + ThreadStateCoordinatorTest.cpp + ThreadStateCoordinatorTestMock.cpp + ) + +target_link_libraries(ProcessLinuxTests + lldbBase + ${PYTHON_LIBRARY} + ) diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt index 4100f8e9e62..6d711f6c246 100644 --- a/lldb/unittests/Utility/CMakeLists.txt +++ b/lldb/unittests/Utility/CMakeLists.txt @@ -1,9 +1,9 @@ -add_lldb_unittest(UtilityTests
- StringExtractorTest.cpp
- UriParserTest.cpp
- )
-
-target_link_libraries(UtilityTests
- lldbBase
- ${PYTHON_LIBRARY}
- )
+add_lldb_unittest(UtilityTests + StringExtractorTest.cpp + UriParserTest.cpp + ) + +target_link_libraries(UtilityTests + lldbBase + ${PYTHON_LIBRARY} + ) diff --git a/lldb/unittests/gtest_common.h b/lldb/unittests/gtest_common.h index 228dfb0d328..1fb394a745e 100644 --- a/lldb/unittests/gtest_common.h +++ b/lldb/unittests/gtest_common.h @@ -1,32 +1,32 @@ -//===-- gtest_common.h ------------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#if defined(LLDB_GTEST_COMMON_H)
-#error "gtest_common.h should not be included manually."
-#else
-#define LLDB_GTEST_COMMON_H
-#endif
-
-// This header file is force included by all of LLDB's unittest compilation
-// units. Be very leary about putting anything in this file.
-
-#if defined(_MSC_VER) && (_HAS_EXCEPTIONS == 0)
-// MSVC's STL implementation tries to work well with /EHs-c- and
-// _HAS_EXCEPTIONS=0. But <thread> in particular doesn't work with it, because
-// it relies on <concrt.h> which tries to throw an exception without checking
-// for _HAS_EXCEPTIONS=0. This causes the linker to require a definition of
-// __uncaught_exception(), but the STL doesn't define this function when
-// _HAS_EXCEPTIONS=0. The workaround here is to just provide a stub
-// implementation to get it to link.
-inline bool
-__uncaught_exception()
-{
- return true;
-}
-#endif
+//===-- gtest_common.h ------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#if defined(LLDB_GTEST_COMMON_H) +#error "gtest_common.h should not be included manually." +#else +#define LLDB_GTEST_COMMON_H +#endif + +// This header file is force included by all of LLDB's unittest compilation +// units. Be very leary about putting anything in this file. + +#if defined(_MSC_VER) && (_HAS_EXCEPTIONS == 0) +// MSVC's STL implementation tries to work well with /EHs-c- and +// _HAS_EXCEPTIONS=0. But <thread> in particular doesn't work with it, because +// it relies on <concrt.h> which tries to throw an exception without checking +// for _HAS_EXCEPTIONS=0. This causes the linker to require a definition of +// __uncaught_exception(), but the STL doesn't define this function when +// _HAS_EXCEPTIONS=0. The workaround here is to just provide a stub +// implementation to get it to link. +inline bool +__uncaught_exception() +{ + return true; +} +#endif |

