diff options
| author | Andreas Gampe <agampe@google.com> | 2014-03-12 14:11:40 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-12 14:20:31 -0700 |
| commit | cfa5c4805b9e756aaa142047306bad2b13107834 (patch) | |
| tree | 067839e9acc27de8c6c4abf7e5447ec943a50250 /runtime/base | |
| parent | 63dcdff34c40a64df6939ea5bba71813abd2acd3 (diff) | |
| download | art-cfa5c4805b9e756aaa142047306bad2b13107834.zip art-cfa5c4805b9e756aaa142047306bad2b13107834.tar.gz art-cfa5c4805b9e756aaa142047306bad2b13107834.tar.bz2 | |
Fix tests for 64b
These tests make assumptions about pointer sizes.
Change-Id: Idfd410144393d716ae176a6e9a51c5b414e0888e
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/hex_dump_test.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/runtime/base/hex_dump_test.cc b/runtime/base/hex_dump_test.cc index d950961..3d782b2 100644 --- a/runtime/base/hex_dump_test.cc +++ b/runtime/base/hex_dump_test.cc @@ -24,11 +24,18 @@ namespace art { +#if defined(__LP64__) +#define ZEROPREFIX "00000000" +#else +#define ZEROPREFIX +#endif + TEST(HexDump, OneLine) { const char* test_text = "0123456789abcdef"; std::ostringstream oss; oss << HexDump(test_text, strlen(test_text), false, ""); EXPECT_STREQ(oss.str().c_str(), + ZEROPREFIX "00000000: 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 0123456789abcdef"); } @@ -37,7 +44,9 @@ TEST(HexDump, MultiLine) { std::ostringstream oss; oss << HexDump(test_text, strlen(test_text), false, ""); EXPECT_STREQ(oss.str().c_str(), + ZEROPREFIX "00000000: 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 0123456789abcdef\n" + ZEROPREFIX "00000010: 30 31 32 33 34 35 36 37 38 39 41 42 43 44 45 46 0123456789ABCDEF"); } @@ -56,7 +65,7 @@ TEST(HexDump, Prefix) { std::ostringstream oss; oss << HexDump(test_text, strlen(test_text), false, "test prefix: "); EXPECT_STREQ(oss.str().c_str(), - "test prefix: 00000000: 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 " + "test prefix: " ZEROPREFIX "00000000: 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 " "0123456789abcdef"); } |