diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-24 11:57:37 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-24 12:51:23 +0100 |
commit | 4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe (patch) | |
tree | a2472f415d7544a7599905cfa0cdaba0fb77c918 /runtime/utils_test.cc | |
parent | c5cb691ca6a746a193bfbe3525aafa7cbb281d40 (diff) | |
download | art-4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe.tar.gz art-4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe.tar.bz2 art-4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe.zip |
Make tests assume ANDROID_ROOT is not /system.
This is to enable better chroot-like testing.
Change-Id: I943c68b0ebcdab2f107f808b466ac694085255aa
Diffstat (limited to 'runtime/utils_test.cc')
-rw-r--r-- | runtime/utils_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index ae24b77625..d8f8950fbd 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -384,7 +384,8 @@ TEST_F(UtilsTest, GetSystemImageFilename) { TEST_F(UtilsTest, ExecSuccess) { std::vector<std::string> command; if (kIsTargetBuild) { - command.push_back("/system/bin/id"); + std::string android_root(GetAndroidRoot()); + command.push_back(android_root + "/bin/id"); } else { command.push_back("/usr/bin/id"); } |