diff options
| author | 2019-03-21 15:25:29 -0700 | |
|---|---|---|
| committer | 2019-03-21 15:25:29 -0700 | |
| commit | bcec18decd19e539b59cd02b9dd0110b07846fd3 (patch) | |
| tree | 30d757dc00e0888c22cb9b7db6676fe5ddb5819c | |
| parent | 7c3ae9c745ec325690cd60d791bde7ec1183da42 (diff) | |
| parent | 71dad97f0df5a6715d71d871584e69ea49700ee7 (diff) | |
Merge "Fix installd_dexopt_test." am: c684ad61dc am: cc20457c7b
am: 71dad97f0d
Change-Id: Ibed722c481448f9a9bd83e5d3fe2982eb439ffdb
| -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'"); } |