commit 4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 24 11:57:37 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Apr 24 12:51:23 2015 +0100
tree a2472f415d7544a7599905cfa0cdaba0fb77c918
parent c5cb691ca6a746a193bfbe3525aafa7cbb281d40

Make tests assume ANDROID_ROOT is not /system.

This is to enable better chroot-like testing.

Change-Id: I943c68b0ebcdab2f107f808b466ac694085255aa

runtime/utils_test.cc

diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc
index ae24b77..d8f8950 100644
--- a/runtime/utils_test.cc
+++ b/runtime/utils_test.cc
@@ -384,7 +384,8 @@
 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");
   }