generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 34da32e7: Merge "Add missing type casts before comparison."

Browse Source 
* commit '34da32e7dd00270e98b845f8a810a6f12ffffb9b':
  Add missing type casts before comparison.
This commit is contained in:
Chih-Hung Hsieh
2014-08-27 22:05:14 +00:00
committed by Android Git Automerger
parent 725fae1de4 34da32e7dd
commit 2dc7fd03e7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/dlext_test.cpp
View File

@@ -117,7 +117,7 @@ TEST_F(DlExtTest, Reserved) {
ASSERT_DL_NOTNULL(handle_); ASSERT_DL_NOTNULL(handle_);
fn f = reinterpret_cast<fn>(dlsym(handle_, "getRandomNumber")); fn f = reinterpret_cast<fn>(dlsym(handle_, "getRandomNumber"));
ASSERT_DL_NOTNULL(f); ASSERT_DL_NOTNULL(f);
EXPECT_GE(f, start); EXPECT_GE(reinterpret_cast<void*>(f), start);
EXPECT_LT(reinterpret_cast<void*>(f), EXPECT_LT(reinterpret_cast<void*>(f),
reinterpret_cast<char*>(start) + LIBSIZE); reinterpret_cast<char*>(start) + LIBSIZE);
EXPECT_EQ(4, f()); EXPECT_EQ(4, f());
@@ -147,7 +147,7 @@ TEST_F(DlExtTest, ReservedHint) {
ASSERT_DL_NOTNULL(handle_); ASSERT_DL_NOTNULL(handle_);
fn f = reinterpret_cast<fn>(dlsym(handle_, "getRandomNumber")); fn f = reinterpret_cast<fn>(dlsym(handle_, "getRandomNumber"));
ASSERT_DL_NOTNULL(f); ASSERT_DL_NOTNULL(f);
EXPECT_GE(f, start); EXPECT_GE(reinterpret_cast<void*>(f), start);
EXPECT_LT(reinterpret_cast<void*>(f), EXPECT_LT(reinterpret_cast<void*>(f),
reinterpret_cast<char*>(start) + LIBSIZE); reinterpret_cast<char*>(start) + LIBSIZE);
EXPECT_EQ(4, f()); EXPECT_EQ(4, f());
@@ -165,7 +165,8 @@ TEST_F(DlExtTest, ReservedHintTooSmall) {
ASSERT_DL_NOTNULL(handle_); ASSERT_DL_NOTNULL(handle_);
fn f = reinterpret_cast<fn>(dlsym(handle_, "getRandomNumber")); fn f = reinterpret_cast<fn>(dlsym(handle_, "getRandomNumber"));
ASSERT_DL_NOTNULL(f); ASSERT_DL_NOTNULL(f);
EXPECT_TRUE(f < start || (reinterpret_cast<void*>(f) >= EXPECT_TRUE(reinterpret_cast<void*>(f) < start ||
(reinterpret_cast<void*>(f) >=
reinterpret_cast<char*>(start) + PAGE_SIZE)); reinterpret_cast<char*>(start) + PAGE_SIZE));
EXPECT_EQ(4, f()); EXPECT_EQ(4, f());
} }