summaryrefslogtreecommitdiffstats
path: root/lldb/unittests/Utility/StringExtractorTest.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2015-03-17 03:32:21 +0000
committerDavid Blaikie <dblaikie@gmail.com>2015-03-17 03:32:21 +0000
commit3dfb86b641a3d3d9cb2149d1892abe06b4e453c5 (patch)
treebf41a253c91835232d00c198bb93c4dd4731a061 /lldb/unittests/Utility/StringExtractorTest.cpp
parentbaf1aaaf1fb7fe2f543ffe2515641dd2f5c9d635 (diff)
downloadbcm5719-llvm-3dfb86b641a3d3d9cb2149d1892abe06b4e453c5.tar.gz
bcm5719-llvm-3dfb86b641a3d3d9cb2149d1892abe06b4e453c5.zip
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. llvm-svn: 232461
Diffstat (limited to 'lldb/unittests/Utility/StringExtractorTest.cpp')
-rw-r--r--lldb/unittests/Utility/StringExtractorTest.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/lldb/unittests/Utility/StringExtractorTest.cpp b/lldb/unittests/Utility/StringExtractorTest.cpp
index cbb3816b79b..3880872f6bb 100644
--- a/lldb/unittests/Utility/StringExtractorTest.cpp
+++ b/lldb/unittests/Utility/StringExtractorTest.cpp
@@ -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_Underflow)
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_Underflow2)
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_InvalidHex)
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_InvalidHex2)
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_Exact)
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_Extra)
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_Underflow)
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_Underflow2)
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_InvalidHex)
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_Exact)
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_Extra)
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_Underflow_NoEof)
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_Underflow2_NoEof)
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_InvalidHex_NoEof)
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_Exact_NoEof)
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_Extra_NoEof)
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_Underflow)
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_Partial)
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, GetHexBytesAvail)
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, GetHexBytesAvail_Underflow)
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, GetHexBytesAvail_Partial)
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());
}
OpenPOWER on IntegriCloud