diff options
| author | Pavel Labath <labath@google.com> | 2017-02-17 10:19:46 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2017-02-17 10:19:46 +0000 |
| commit | a272fa8fff0674a2435603d5e8e7c095d6095483 (patch) | |
| tree | 850dd350767fac0ccc0bf6b7337b8ba288d583ad | |
| parent | e2fa53030e1457060e5b88d4168be9c5b121054c (diff) | |
| download | bcm5719-llvm-a272fa8fff0674a2435603d5e8e7c095d6095483.tar.gz bcm5719-llvm-a272fa8fff0674a2435603d5e8e7c095d6095483.zip | |
Fix breakage caused by r295368
Also move the ErrorTest into the Utility package, to follow the class it
is testing.
llvm-svn: 295436
| -rw-r--r-- | lldb/source/Utility/Error.cpp | 1 | ||||
| -rw-r--r-- | lldb/unittests/Core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lldb/unittests/Utility/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | lldb/unittests/Utility/ErrorTest.cpp (renamed from lldb/unittests/Core/ErrorTest.cpp) | 0 |
4 files changed, 4 insertions, 3 deletions
diff --git a/lldb/source/Utility/Error.cpp b/lldb/source/Utility/Error.cpp index 0b14949e88f..32f60b39729 100644 --- a/lldb/source/Utility/Error.cpp +++ b/lldb/source/Utility/Error.cpp @@ -235,6 +235,7 @@ int Error::SetErrorStringWithVarArg(const char *format, va_list args) { llvm::SmallString<1024> buf; VASprintf(buf, format, args); + m_string = buf.str(); return buf.size(); } else { m_string.clear(); diff --git a/lldb/unittests/Core/CMakeLists.txt b/lldb/unittests/Core/CMakeLists.txt index f353f05c2fd..642ad0223d2 100644 --- a/lldb/unittests/Core/CMakeLists.txt +++ b/lldb/unittests/Core/CMakeLists.txt @@ -2,7 +2,6 @@ add_lldb_unittest(LLDBCoreTests ArchSpecTest.cpp BroadcasterTest.cpp DataExtractorTest.cpp - ErrorTest.cpp ListenerTest.cpp LogTest.cpp ScalarTest.cpp diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt index e78e4e55c84..cd6c19273bb 100644 --- a/lldb/unittests/Utility/CMakeLists.txt +++ b/lldb/unittests/Utility/CMakeLists.txt @@ -1,5 +1,6 @@ add_lldb_unittest(UtilityTests ConstStringTest.cpp + ErrorTest.cpp StringExtractorTest.cpp TaskPoolTest.cpp TimeoutTest.cpp @@ -8,6 +9,6 @@ add_lldb_unittest(UtilityTests LINK_LIBS lldbUtility - LINK_COMPONENTS - Support + LINK_COMPONENTS + Support ) diff --git a/lldb/unittests/Core/ErrorTest.cpp b/lldb/unittests/Utility/ErrorTest.cpp index a114b26ebe5..a114b26ebe5 100644 --- a/lldb/unittests/Core/ErrorTest.cpp +++ b/lldb/unittests/Utility/ErrorTest.cpp |
