[Lldb-commits] [lldb] r232461 - Fix the clang -Werror build & make the unit tests link under Linux
David Blaikie
dblaikie at gmail.com
Mon Mar 16 20:57:51 PDT 2015
On Mon, Mar 16, 2015 at 8:52 PM, Zachary Turner <zturner at google.com> wrote:
> This is amazing, thank you. I was actually stuck on this earlier and
> unsure how to fix it.
>
Sure thing - took me a while to muddle through it myself. It's still a
little cargo-culty. (I managed to get the linker line to work hand-crafted
with some reordering, but I couldn't tell you /exactly/ how these CMake
incantations produce that right linker line) - given it's how clang does
it, I assume/hope it works for other platforms too.
> On Mon, Mar 16, 2015 at 8:35 PM David Blaikie <dblaikie at gmail.com> wrote:
>
>> Author: dblaikie
>> Date: Mon Mar 16 22:32:21 2015
>> New Revision: 232461
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=232461&view=rev
>> Log:
>> Fix the clang -Werror build & make the unit tests link under Linux
>>
>> The order of libraries passed to the linker didn't work under linux (you
>> need the llvm libraries first, then the lldb libraries). I modelled this
>> after clang's setup here. Seemed simple enough to just be consistent.
>>
>> Modified:
>> lldb/trunk/scripts/Python/python-wrapper.swig
>> lldb/trunk/unittests/CMakeLists.txt
>> lldb/trunk/unittests/Host/CMakeLists.txt
>> lldb/trunk/unittests/Interpreter/CMakeLists.txt
>> lldb/trunk/unittests/Interpreter/TestArgs.cpp
>> lldb/trunk/unittests/Plugins/Process/Linux/CMakeLists.txt
>> lldb/trunk/unittests/Plugins/Process/Linux/
>> ThreadStateCoordinatorTest.cpp
>> lldb/trunk/unittests/Utility/CMakeLists.txt
>> lldb/trunk/unittests/Utility/StringExtractorTest.cpp
>>
>> Modified: lldb/trunk/scripts/Python/python-wrapper.swig
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/
>> Python/python-wrapper.swig?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/scripts/Python/python-wrapper.swig (original)
>> +++ lldb/trunk/scripts/Python/python-wrapper.swig Mon Mar 16 22:32:21
>> 2015
>> @@ -919,28 +919,22 @@ LLDBSwigPythonCallCommandObject
>> lldb::SBDebugger debugger_sb(debugger);
>> lldb::SBExecutionContext exe_ctx_sb(exe_ctx_ref_sp);
>>
>> - bool retval = false;
>> + PyErr_Cleaner py_err_cleaner(true);
>>
>> - {
>> - PyErr_Cleaner py_err_cleaner(true);
>> + PyCallable pfunc = PyCallable::FindWithMemberFunction(
>> implementor,"__call__");
>>
>> - PyCallable pfunc = PyCallable::FindWithMemberFunction(
>> implementor,"__call__");
>> + if (!pfunc)
>> + return false;
>>
>> - if (!pfunc)
>> - return NULL;
>> + // pass the pointer-to cmd_retobj_sb or watch the underlying object
>> disappear from under you
>> + // see comment above for SBCommandReturnObjectReleaser for further
>> details
>> + PyObject* pvalue = NULL;
>>
>> - // pass the pointer-to cmd_retobj_sb or watch the underlying
>> object disappear from under you
>> - // see comment above for SBCommandReturnObjectReleaser for
>> further details
>> - PyObject* pvalue = NULL;
>> + pvalue = pfunc(debugger_sb, args, exe_ctx_sb, &cmd_retobj_sb);
>>
>> - pvalue = pfunc(debugger_sb, args, exe_ctx_sb, &cmd_retobj_sb);
>> + Py_XDECREF (pvalue);
>>
>> - Py_XDECREF (pvalue);
>> -
>> - retval = true;
>> - }
>> -
>> - return retval;
>> + return true;
>> }
>>
>> SWIGEXPORT void*
>>
>> Modified: lldb/trunk/unittests/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> CMakeLists.txt?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/CMakeLists.txt (original)
>> +++ lldb/trunk/unittests/CMakeLists.txt Mon Mar 16 22:32:21 2015
>> @@ -15,9 +15,6 @@ endif ()
>> # Will compile the list of files together and link against
>> function(add_lldb_unittest test_name)
>> add_unittest(LLDBUnitTests ${test_name} ${ARGN})
>> -
>> - target_link_libraries(${test_name} lldbBase)
>> - target_link_libraries(${test_name} ${LLDB_USED_LIBS})
>> endfunction()
>>
>> add_subdirectory(Host)
>>
>> Modified: lldb/trunk/unittests/Host/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Host/CMakeLists.txt?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Host/CMakeLists.txt (original)
>> +++ lldb/trunk/unittests/Host/CMakeLists.txt Mon Mar 16 22:32:21 2015
>> @@ -3,3 +3,8 @@ add_lldb_unittest(HostTests
>> SocketTest.cpp
>> SocketTestMock.cpp
>> )
>> +
>> +target_link_libraries(HostTests
>> + lldbBase
>> + ${PYTHON_LIBRARY}
>> + )
>>
>> Modified: lldb/trunk/unittests/Interpreter/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Interpreter/CMakeLists.txt?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Interpreter/CMakeLists.txt (original)
>> +++ lldb/trunk/unittests/Interpreter/CMakeLists.txt Mon Mar 16 22:32:21
>> 2015
>> @@ -1,8 +1,8 @@
>> -set(LLDB_USED_LIBS
>> - lldbInterpreter
>> - ${PYTHON_LIBRARY}
>> - )
>> -
>> add_lldb_unittest(InterpreterTests
>> TestArgs.cpp
>> )
>> +
>> +target_link_libraries(InterpreterTests
>> + lldbInterpreter
>> + ${PYTHON_LIBRARY}
>> + )
>>
>> Modified: lldb/trunk/unittests/Interpreter/TestArgs.cpp
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Interpreter/TestArgs.cpp?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Interpreter/TestArgs.cpp (original)
>> +++ lldb/trunk/unittests/Interpreter/TestArgs.cpp Mon Mar 16 22:32:21
>> 2015
>> @@ -17,7 +17,7 @@ TEST(ArgsTest, TestSingleArg)
>> {
>> Args args;
>> args.SetCommandString("arg");
>> - EXPECT_EQ(1, args.GetArgumentCount());
>> + EXPECT_EQ(1u, args.GetArgumentCount());
>> EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg");
>> }
>>
>> @@ -25,7 +25,7 @@ TEST(ArgsTest, TestSingleQuotedArgWithSp
>> {
>> Args args;
>> args.SetCommandString("\"arg with space\"");
>> - EXPECT_EQ(1, args.GetArgumentCount());
>> + EXPECT_EQ(1u, args.GetArgumentCount());
>> EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg with space");
>> }
>>
>> @@ -33,7 +33,7 @@ TEST(ArgsTest, TestSingleArgWithQuotedSp
>> {
>> Args args;
>> args.SetCommandString("arg\\ with\\ space");
>> - EXPECT_EQ(1, args.GetArgumentCount());
>> + EXPECT_EQ(1u, args.GetArgumentCount());
>> EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg with space");
>> }
>>
>> @@ -41,7 +41,7 @@ TEST(ArgsTest, TestMultipleArgs)
>> {
>> Args args;
>> args.SetCommandString("this has multiple args");
>> - EXPECT_EQ(4, args.GetArgumentCount());
>> + EXPECT_EQ(4u, args.GetArgumentCount());
>> EXPECT_STREQ(args.GetArgumentAtIndex(0), "this");
>> EXPECT_STREQ(args.GetArgumentAtIndex(1), "has");
>> EXPECT_STREQ(args.GetArgumentAtIndex(2), "multiple");
>> @@ -52,9 +52,9 @@ TEST(ArgsTest, TestOverwriteArgs)
>> {
>> Args args;
>> args.SetCommandString("this has multiple args");
>> - EXPECT_EQ(4, args.GetArgumentCount());
>> + EXPECT_EQ(4u, args.GetArgumentCount());
>> args.SetCommandString("arg");
>> - EXPECT_EQ(1, args.GetArgumentCount());
>> + EXPECT_EQ(1u, args.GetArgumentCount());
>> EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg");
>> }
>>
>> @@ -62,9 +62,9 @@ TEST(ArgsTest, TestAppendArg)
>> {
>> Args args;
>> args.SetCommandString("first_arg");
>> - EXPECT_EQ(1, args.GetArgumentCount());
>> + EXPECT_EQ(1u, args.GetArgumentCount());
>> args.AppendArgument("second_arg");
>> - EXPECT_EQ(2, args.GetArgumentCount());
>> + EXPECT_EQ(2u, args.GetArgumentCount());
>> EXPECT_STREQ(args.GetArgumentAtIndex(0), "first_arg");
>> EXPECT_STREQ(args.GetArgumentAtIndex(1), "second_arg");
>> }
>>
>> Modified: lldb/trunk/unittests/Plugins/Process/Linux/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Plugins/Process/Linux/CMakeLists.txt?rev=232461&r1=
>> 232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Plugins/Process/Linux/CMakeLists.txt (original)
>> +++ lldb/trunk/unittests/Plugins/Process/Linux/CMakeLists.txt Mon Mar 16
>> 22:32:21 2015
>> @@ -2,3 +2,8 @@ add_lldb_unittest(ProcessLinuxTests
>> ThreadStateCoordinatorTest.cpp
>> ThreadStateCoordinatorTestMock.cpp
>> )
>> +
>> +target_link_libraries(ProcessLinuxTests
>> + lldbBase
>> + ${PYTHON_LIBRARY}
>> + )
>>
>> Modified: lldb/trunk/unittests/Plugins/Process/Linux/
>> ThreadStateCoordinatorTest.cpp
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Plugins/Process/Linux/ThreadStateCoordinatorTest.
>> cpp?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp
>> (original)
>> +++ lldb/trunk/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp
>> Mon Mar 16 22:32:21 2015
>> @@ -11,12 +11,6 @@ namespace
>> const ThreadStateCoordinator::ThreadIDSet EMPTY_THREAD_ID_SET;
>>
>> void
>> - NOPLogger (const char *format, va_list args)
>> - {
>> - // Do nothing.
>> - }
>> -
>> - void
>> StdoutLogger (const char *format, va_list args)
>> {
>> // Print to stdout.
>> @@ -279,7 +273,7 @@ TEST_F (ThreadStateCoordinatorTest, Call
>> ASSERT_EQ (false, DidFireDeferredNotification ());
>>
>> // Shouldn't have triggered stop request due to unknown tid.
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>> }
>>
>> TEST_F (ThreadStateCoordinatorTest, CallAfterThreadsStopFiresWhenN
>> oPendingStops)
>> @@ -358,13 +352,13 @@ TEST_F (ThreadStateCoordinatorTest, Call
>>
>> // Neither trigger should have gone off yet.
>> ASSERT_EQ (false, DidFireDeferredNotification ());
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>>
>> // Process next event.
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>>
>> // Now the request thread stops should have been called for the
>> pending stop tids.
>> - ASSERT_EQ (2, GetRequestedStopCount ());
>> + ASSERT_EQ (2u, GetRequestedStopCount ());
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID));
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID_02));
>>
>> @@ -437,7 +431,7 @@ TEST_F (ThreadStateCoordinatorTest, Call
>>
>> // Neither trigger should have gone off yet.
>> ASSERT_EQ (false, DidFireDeferredNotification ());
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>>
>> // Process next event.
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>> @@ -471,7 +465,7 @@ TEST_F (ThreadStateCoordinatorTest, Call
>>
>> // Neither trigger should have gone off yet.
>> ASSERT_EQ (false, DidFireDeferredNotification ());
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>>
>> // Process next event.
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>> @@ -509,7 +503,7 @@ TEST_F (ThreadStateCoordinatorTest, Exis
>>
>> // Neither trigger should have gone off yet.
>> ASSERT_EQ (false, DidFireDeferredNotification ());
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>>
>> // Process next event.
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>> @@ -524,7 +518,7 @@ TEST_F (ThreadStateCoordinatorTest, Exis
>> SetupKnownRunningThread (NEW_THREAD_TID);
>>
>> // We should have just received a stop request for the new thread id.
>> - ASSERT_EQ (2, GetRequestedStopCount ());
>> + ASSERT_EQ (2u, GetRequestedStopCount ());
>> ASSERT_EQ (true, DidRequestStopForTid (NEW_THREAD_TID));
>>
>> // Now report the original pending tid stopped. This should no
>> longer
>> @@ -688,13 +682,13 @@ TEST_F (ThreadStateCoordinatorTest, Resu
>>
>> // Neither trigger should have gone off yet.
>> ASSERT_EQ (false, DidFireDeferredNotification ());
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>>
>> // Execute CallAfterThreadsStop.
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>>
>> // Both TID A and TID B should have had stop requests made.
>> - ASSERT_EQ (2, GetRequestedStopCount ());
>> + ASSERT_EQ (2u, GetRequestedStopCount ());
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_TID_A));
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_TID_B));
>>
>> @@ -748,7 +742,7 @@ TEST_F (ThreadStateCoordinatorTest, Call
>> ASSERT_EQ (TRIGGERING_TID, GetDeferredNotificationTID ());
>>
>> // And no stop requests should have been made.
>> - ASSERT_EQ (0, GetRequestedStopCount ());
>> + ASSERT_EQ (0u, GetRequestedStopCount ());
>> }
>>
>> TEST_F (ThreadStateCoordinatorTest, CallAfterRunningThreadsStopReq
>> uestsTwoPendingStops)
>> @@ -768,7 +762,7 @@ TEST_F (ThreadStateCoordinatorTest, Call
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>>
>> // We should have two stop requests for the two threads currently
>> running.
>> - ASSERT_EQ (2, GetRequestedStopCount ());
>> + ASSERT_EQ (2u, GetRequestedStopCount ());
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID));
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID_02));
>>
>> @@ -805,7 +799,7 @@ TEST_F (ThreadStateCoordinatorTest, Call
>> ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
>>
>> // We should have two stop requests for the two threads currently
>> running.
>> - ASSERT_EQ (1, GetRequestedStopCount ());
>> + ASSERT_EQ (1u, GetRequestedStopCount ());
>> ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID));
>>
>> // But the deferred stop notification should not have fired yet.
>>
>> Modified: lldb/trunk/unittests/Utility/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Utility/CMakeLists.txt?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Utility/CMakeLists.txt (original)
>> +++ lldb/trunk/unittests/Utility/CMakeLists.txt Mon Mar 16 22:32:21 2015
>> @@ -2,3 +2,8 @@ add_lldb_unittest(UtilityTests
>> StringExtractorTest.cpp
>> UriParserTest.cpp
>> )
>> +
>> +target_link_libraries(UtilityTests
>> + lldbBase
>> + ${PYTHON_LIBRARY}
>> + )
>>
>> Modified: lldb/trunk/unittests/Utility/StringExtractorTest.cpp
>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/
>> Utility/StringExtractorTest.cpp?rev=232461&r1=232460&r2=232461&view=diff
>> ============================================================
>> ==================
>> --- lldb/trunk/unittests/Utility/StringExtractorTest.cpp (original)
>> +++ lldb/trunk/unittests/Utility/StringExtractorTest.cpp Mon Mar 16
>> 22:32:21 2015
>> @@ -16,10 +16,10 @@ TEST_F (StringExtractorTest, InitEmpty)
>> StringExtractor ex (kEmptyString);
>>
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> ASSERT_STREQ (kEmptyString, ex.GetStringRef().c_str());
>> ASSERT_EQ (true, ex.Empty());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -29,7 +29,7 @@ TEST_F (StringExtractorTest, InitMisc)
>> StringExtractor ex (kInitMiscString);
>>
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> ASSERT_STREQ (kInitMiscString, ex.GetStringRef().c_str());
>> ASSERT_EQ (false, ex.Empty());
>> ASSERT_EQ (sizeof(kInitMiscString)-1, ex.GetBytesLeft());
>> @@ -43,9 +43,9 @@ TEST_F (StringExtractorTest, DecodeHexU8
>>
>> ASSERT_EQ (-1, ex.DecodeHexU8());
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> ASSERT_EQ (true, ex.Empty());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -56,8 +56,8 @@ TEST_F (StringExtractorTest, DecodeHexU8
>>
>> ASSERT_EQ (-1, ex.DecodeHexU8());
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> - ASSERT_EQ (1, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> + ASSERT_EQ (1u, ex.GetBytesLeft());
>> ASSERT_EQ ('1', *ex.Peek());
>> }
>>
>> @@ -68,8 +68,8 @@ TEST_F (StringExtractorTest, DecodeHexU8
>>
>> ASSERT_EQ (-1, ex.DecodeHexU8());
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> - ASSERT_EQ (2, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> + ASSERT_EQ (2u, ex.GetBytesLeft());
>> ASSERT_EQ ('x', *ex.Peek());
>> }
>>
>> @@ -80,8 +80,8 @@ TEST_F (StringExtractorTest, DecodeHexU8
>>
>> ASSERT_EQ (-1, ex.DecodeHexU8());
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> - ASSERT_EQ (2, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> + ASSERT_EQ (2u, ex.GetBytesLeft());
>> ASSERT_EQ ('a', *ex.Peek());
>> }
>>
>> @@ -92,8 +92,8 @@ TEST_F (StringExtractorTest, DecodeHexU8
>>
>> ASSERT_EQ (0x12, ex.DecodeHexU8());
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (2, ex.GetFilePos());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (2u, ex.GetFilePos());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -104,8 +104,8 @@ TEST_F (StringExtractorTest, DecodeHexU8
>>
>> ASSERT_EQ (0x12, ex.DecodeHexU8());
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (2, ex.GetFilePos());
>> - ASSERT_EQ (2, ex.GetBytesLeft());
>> + ASSERT_EQ (2u, ex.GetFilePos());
>> + ASSERT_EQ (2u, ex.GetBytesLeft());
>> ASSERT_EQ ('3', *ex.Peek());
>> }
>>
>> @@ -118,7 +118,7 @@ TEST_F (StringExtractorTest, GetHexU8_Un
>> ASSERT_EQ (false, ex.IsGood());
>> ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
>> ASSERT_EQ (true, ex.Empty());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -130,7 +130,7 @@ TEST_F (StringExtractorTest, GetHexU8_Un
>> ASSERT_EQ (0xbc, ex.GetHexU8(0xbc));
>> ASSERT_EQ (false, ex.IsGood());
>> ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -142,7 +142,7 @@ TEST_F (StringExtractorTest, GetHexU8_In
>> ASSERT_EQ (0xcd, ex.GetHexU8(0xcd));
>> ASSERT_EQ (false, ex.IsGood());
>> ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -153,8 +153,8 @@ TEST_F (StringExtractorTest, GetHexU8_Ex
>>
>> ASSERT_EQ (0x12, ex.GetHexU8(0x12));
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (2, ex.GetFilePos());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (2u, ex.GetFilePos());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -165,8 +165,8 @@ TEST_F (StringExtractorTest, GetHexU8_Ex
>>
>> ASSERT_EQ (0x12, ex.GetHexU8(0x12));
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (2, ex.GetFilePos());
>> - ASSERT_EQ (2, ex.GetBytesLeft());
>> + ASSERT_EQ (2u, ex.GetFilePos());
>> + ASSERT_EQ (2u, ex.GetBytesLeft());
>> ASSERT_EQ ('3', *ex.Peek());
>> }
>>
>> @@ -180,7 +180,7 @@ TEST_F (StringExtractorTest, GetHexU8_Un
>> ASSERT_EQ (false, ex.IsGood()); // this result seems inconsistent
>> with kSetEofOnFail == false
>> ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
>> ASSERT_EQ (true, ex.Empty());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -192,8 +192,8 @@ TEST_F (StringExtractorTest, GetHexU8_Un
>>
>> ASSERT_EQ (0xbc, ex.GetHexU8(0xbc, kSetEofOnFail));
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> - ASSERT_EQ (1, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> + ASSERT_EQ (1u, ex.GetBytesLeft());
>> ASSERT_EQ ('1', *ex.Peek());
>> }
>>
>> @@ -205,8 +205,8 @@ TEST_F (StringExtractorTest, GetHexU8_In
>>
>> ASSERT_EQ (0xcd, ex.GetHexU8(0xcd, kSetEofOnFail));
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (0, ex.GetFilePos());
>> - ASSERT_EQ (2, ex.GetBytesLeft());
>> + ASSERT_EQ (0u, ex.GetFilePos());
>> + ASSERT_EQ (2u, ex.GetBytesLeft());
>> ASSERT_EQ ('x', *ex.Peek());
>> }
>>
>> @@ -218,8 +218,8 @@ TEST_F (StringExtractorTest, GetHexU8_Ex
>>
>> ASSERT_EQ (0x12, ex.GetHexU8(0x12, kSetEofOnFail));
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (2, ex.GetFilePos());
>> - ASSERT_EQ (0, ex.GetBytesLeft());
>> + ASSERT_EQ (2u, ex.GetFilePos());
>> + ASSERT_EQ (0u, ex.GetBytesLeft());
>> ASSERT_EQ (nullptr, ex.Peek());
>> }
>>
>> @@ -231,8 +231,8 @@ TEST_F (StringExtractorTest, GetHexU8_Ex
>>
>> ASSERT_EQ (0x12, ex.GetHexU8(0x12, kSetEofOnFail));
>> ASSERT_EQ (true, ex.IsGood());
>> - ASSERT_EQ (2, ex.GetFilePos());
>> - ASSERT_EQ (2, ex.GetBytesLeft());
>> + ASSERT_EQ (2u, ex.GetFilePos());
>> + ASSERT_EQ (2u, ex.GetBytesLeft());
>> ASSERT_EQ ('3', *ex.Peek());
>> }
>>
>> @@ -256,7 +256,7 @@ TEST_F (StringExtractorTest, GetHexBytes
>> ASSERT_EQ(true, ex.IsGood());
>> ASSERT_EQ(2*kValidHexPairs, ex.GetFilePos());
>> ASSERT_EQ(false, ex.Empty());
>> - ASSERT_EQ(4, ex.GetBytesLeft());
>> + ASSERT_EQ(4u, ex.GetBytesLeft());
>> ASSERT_EQ('x', *ex.Peek());
>> }
>>
>> @@ -285,7 +285,7 @@ TEST_F (StringExtractorTest, GetHexBytes
>> ASSERT_EQ(false, ex.IsGood());
>> ASSERT_EQ(UINT64_MAX, ex.GetFilePos());
>> ASSERT_EQ(false, ex.Empty());
>> - ASSERT_EQ(0, ex.GetBytesLeft());
>> + ASSERT_EQ(0u, ex.GetBytesLeft());
>> ASSERT_EQ(0, ex.Peek());
>> }
>>
>> @@ -315,7 +315,7 @@ TEST_F (StringExtractorTest, GetHexBytes
>> ASSERT_EQ(true, ex.IsGood());
>> ASSERT_EQ(kReadBytes*2, ex.GetFilePos());
>> ASSERT_EQ(false, ex.Empty());
>> - ASSERT_EQ(12, ex.GetBytesLeft());
>> + ASSERT_EQ(12u, ex.GetBytesLeft());
>> ASSERT_EQ('2', *ex.Peek());
>> }
>>
>> @@ -339,7 +339,7 @@ TEST_F (StringExtractorTest, GetHexBytes
>> ASSERT_EQ(true, ex.IsGood());
>> ASSERT_EQ(2*kValidHexPairs, ex.GetFilePos());
>> ASSERT_EQ(false, ex.Empty());
>> - ASSERT_EQ(4, ex.GetBytesLeft());
>> + ASSERT_EQ(4u, ex.GetBytesLeft());
>> ASSERT_EQ('x', *ex.Peek());
>> }
>>
>> @@ -369,7 +369,7 @@ TEST_F (StringExtractorTest, GetHexBytes
>> ASSERT_EQ(true, ex.IsGood());
>> ASSERT_EQ(kValidHexPairs*2, ex.GetFilePos());
>> ASSERT_EQ(false, ex.Empty());
>> - ASSERT_EQ(4, ex.GetBytesLeft());
>> + ASSERT_EQ(4u, ex.GetBytesLeft());
>> ASSERT_EQ('x', *ex.Peek());
>> }
>>
>> @@ -399,7 +399,7 @@ TEST_F (StringExtractorTest, GetHexBytes
>> ASSERT_EQ(true, ex.IsGood());
>> ASSERT_EQ(kReadBytes*2, ex.GetFilePos());
>> ASSERT_EQ(false, ex.Empty());
>> - ASSERT_EQ(12, ex.GetBytesLeft());
>> + ASSERT_EQ(12u, ex.GetBytesLeft());
>> ASSERT_EQ('2', *ex.Peek());
>> }
>>
>>
>>
>> _______________________________________________
>> lldb-commits mailing list
>> lldb-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150316/0480e642/attachment.html>
More information about the lldb-commits
mailing list