diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-07 17:18:07 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-12-07 17:23:26 +0000 |
| commit | db4b1deebf425be5f1d0f597d1ef540f19908324 (patch) | |
| tree | 5851aab8a4d71b49dbd272b822bfd1ae2cbd08df /cmdline | |
| parent | e3c6dfe2009d2fad6f8e4401cb17935bdd09ab9e (diff) | |
| download | art-db4b1deebf425be5f1d0f597d1ef540f19908324.tar.gz art-db4b1deebf425be5f1d0f597d1ef540f19908324.tar.bz2 art-db4b1deebf425be5f1d0f597d1ef540f19908324.zip | |
Revert "Pass boot class path to ImageSpace::LoadBootImage."
This reverts commit d19085141ad9c71eae1b0ff585999ac8e27dadd4.
Also squash a revert of
Fix oatdump tests on target.
(commit 77eea0898aca2881a87afd177a0422870c39a318)
Reason for revert: Broke JDWP tests.
Bug: 119868597
Change-Id: I005097d2d96014c961e5a4c0b089e7675004febc
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index 101e5c42cd..97daafadd8 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -63,12 +63,6 @@ namespace art { return expected == actual; } - template <char Separator> - bool UsuallyEquals(const std::vector<std::string>& expected, - const ParseStringList<Separator>& actual) { - return expected == static_cast<std::vector<std::string>>(actual); - } - // Try to use memcmp to compare simple plain-old-data structs. // // This should *not* generate false positives, but it can generate false negatives. @@ -224,13 +218,8 @@ TEST_F(CmdlineParserTest, TestSimpleSuccesses) { } EXPECT_SINGLE_PARSE_EXISTS("-Xzygote", M::Zygote); - EXPECT_SINGLE_PARSE_VALUE(std::vector<std::string>({"/hello/world"}), - "-Xbootclasspath:/hello/world", - M::BootClassPath); - EXPECT_SINGLE_PARSE_VALUE(std::vector<std::string>({"/hello", "/world"}), - "-Xbootclasspath:/hello:/world", - M::BootClassPath); - EXPECT_SINGLE_PARSE_VALUE_STR("/hello/world", "-classpath /hello/world", M::ClassPath); + EXPECT_SINGLE_PARSE_VALUE_STR("/hello/world", "-Xbootclasspath:/hello/world", M::BootClassPath); + EXPECT_SINGLE_PARSE_VALUE("/hello/world", "-Xbootclasspath:/hello/world", M::BootClassPath); EXPECT_SINGLE_PARSE_VALUE(Memory<1>(234), "-Xss234", M::StackSize); EXPECT_SINGLE_PARSE_VALUE(MemoryKiB(1234*MB), "-Xms1234m", M::MemoryInitialSize); EXPECT_SINGLE_PARSE_VALUE(true, "-XX:EnableHSpaceCompactForOOM", M::EnableHSpaceCompactForOOM); |