diff options
| author | 2018-02-27 11:40:45 -0700 | |
|---|---|---|
| committer | 2018-02-27 11:40:52 -0700 | |
| commit | 8e9bf35a8089e152af3d75e1819d9112cea0c07c (patch) | |
| tree | 0c7b5e7361f8a8a562dccd50cae79bc15a7d809e | |
| parent | 5359430a97127786e37ad8b8cda897064063c04e (diff) | |
Use absolute paths in tests.
Test: /data/nativetest64/installd_cache_test/installd_cache_test
Test: /data/nativetest64/installd_dexopt_test/installd_dexopt_test
Test: /data/nativetest64/installd_otapreopt_test/installd_otapreopt_test
Test: /data/nativetest64/installd_service_test/installd_service_test
Test: /data/nativetest64/installd_utils_test/installd_utils_test
Bug: 73950947
Change-Id: I68c9d5a750d6528aadac40230182602f8222ed5d
| -rw-r--r-- | cmds/installd/InstalldNativeService.cpp | 1 | ||||
| -rw-r--r-- | cmds/installd/tests/installd_dexopt_test.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index dea6c6c8d5..0a45ab0f69 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -112,6 +112,7 @@ static binder::Status ok() { } static binder::Status exception(uint32_t code, const std::string& msg) { + LOG(ERROR) << msg << " (" << code << ")"; return binder::Status::fromExceptionCode(code, String8(msg.c_str())); } diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp index 2629144a41..847be51752 100644 --- a/cmds/installd/tests/installd_dexopt_test.cpp +++ b/cmds/installd/tests/installd_dexopt_test.cpp @@ -375,7 +375,7 @@ protected: bool prof_result; binder::Status prof_binder_result = service_->prepareAppProfile( - package_name_, kTestUserId, kTestAppId, *profile_name_ptr, /*code path*/ "base.apk", + package_name_, kTestUserId, kTestAppId, *profile_name_ptr, apk_path_, /*dex_metadata*/ nullptr, &prof_result); ASSERT_TRUE(prof_binder_result.isOk()); @@ -731,7 +731,7 @@ class ProfileTest : public DexoptTest { bool expected_result) { bool result; binder::Status binder_result = service_->prepareAppProfile( - package_name, kTestUserId, kTestAppId, profile_name, /*code path*/ "base.apk", + package_name, kTestUserId, kTestAppId, profile_name, apk_path_, /*dex_metadata*/ nullptr, &result); ASSERT_TRUE(binder_result.isOk()); ASSERT_EQ(expected_result, result); |