diff options
| author | 2019-03-21 15:13:11 -0700 | |
|---|---|---|
| committer | 2019-03-21 15:13:11 -0700 | |
| commit | 71dad97f0df5a6715d71d871584e69ea49700ee7 (patch) | |
| tree | 0d851833f39c4104aeac9479b26ced35db779c75 | |
| parent | 4fc168050a2f2e5e1333e17a477d009bbafee030 (diff) | |
| parent | cc20457c7b223f4529b9f80b9886992bce9a1b9a (diff) | |
Merge "Fix installd_dexopt_test." am: c684ad61dc
am: cc20457c7b
Change-Id: I132894a725c98679b86700be18b51cddcc90dd7b
| -rw-r--r-- | cmds/installd/tests/installd_dexopt_test.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp index 71b710b0d3..1d4a2f0e5e 100644 --- a/cmds/installd/tests/installd_dexopt_test.cpp +++ b/cmds/installd/tests/installd_dexopt_test.cpp @@ -576,7 +576,7 @@ TEST_F(DexoptTest, DexoptSecondaryStorageValidationError) { CompileSecondaryDex(secondary_dex_ce_, DEXOPT_STORAGE_DE, /*binder_ok*/ false, /*compile_ok*/ false, &status); EXPECT_STREQ(status.toString8().c_str(), - "Status(-8): '-1: Dexoptanalyzer path validation failed'"); + "Status(-8, EX_SERVICE_SPECIFIC): '-1: Dexoptanalyzer path validation failed'"); } TEST_F(DexoptTest, DexoptSecondaryAppOwnershipValidationError) { @@ -585,7 +585,7 @@ TEST_F(DexoptTest, DexoptSecondaryAppOwnershipValidationError) { CompileSecondaryDex("/data/data/random.app/secondary.jar", DEXOPT_STORAGE_CE, /*binder_ok*/ false, /*compile_ok*/ false, &status); EXPECT_STREQ(status.toString8().c_str(), - "Status(-8): '-1: Dexoptanalyzer path validation failed'"); + "Status(-8, EX_SERVICE_SPECIFIC): '-1: Dexoptanalyzer path validation failed'"); } TEST_F(DexoptTest, DexoptSecondaryAcessViaDifferentUidError) { @@ -593,7 +593,8 @@ TEST_F(DexoptTest, DexoptSecondaryAcessViaDifferentUidError) { binder::Status status; CompileSecondaryDex(secondary_dex_ce_, DEXOPT_STORAGE_CE, /*binder_ok*/ false, /*compile_ok*/ false, &status, kSystemUid); - EXPECT_STREQ(status.toString8().c_str(), "Status(-8): '-1: Dexoptanalyzer open zip failed'"); + EXPECT_STREQ(status.toString8().c_str(), + "Status(-8, EX_SERVICE_SPECIFIC): '-1: Dexoptanalyzer open zip failed'"); } TEST_F(DexoptTest, DexoptPrimaryPublic) { @@ -615,7 +616,7 @@ TEST_F(DexoptTest, DexoptPrimaryFailedInvalidFilter) { DEX2OAT_FROM_SCRATCH, &status); EXPECT_STREQ(status.toString8().c_str(), - "Status(-8): \'256: Dex2oat invocation for " + "Status(-8, EX_SERVICE_SPECIFIC): \'256: Dex2oat invocation for " "/data/app/com.installd.test.dexopt/base.jar failed: unspecified dex2oat error'"); } |