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 | |
| parent | c5cb691ca6a746a193bfbe3525aafa7cbb281d40 (diff) | |
| download | android_art-4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe.tar.gz android_art-4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe.tar.bz2 android_art-4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe.zip | |
Make tests assume ANDROID_ROOT is not /system.
This is to enable better chroot-like testing.
Change-Id: I943c68b0ebcdab2f107f808b466ac694085255aa
| -rw-r--r-- | runtime/utils_test.cc | 3 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 1 | ||||
| -rw-r--r-- | tools/art | 1 |
3 files changed, 4 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"); } diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 8dd7573974..1c44958eea 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -364,6 +364,7 @@ if [ "$HOST" = "n" ]; then export ANDROID_ROOT=$ANDROID_ROOT && \ $mkdir_cmdline && \ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH && \ + export PATH=$ANDROID_ROOT/bin:$PATH && \ $dex2oat_cmdline && \ $dalvikvm_cmdline" @@ -92,6 +92,7 @@ fi ANDROID_DATA=$ANDROID_DATA \ ANDROID_ROOT=$ANDROID_ROOT \ LD_LIBRARY_PATH=$LD_LIBRARY_PATH \ + PATH=$ANDROID_ROOT/bin:$PATH \ $invoke_with $ANDROID_ROOT/bin/$DALVIKVM $lib \ -XXlib:$LIBART \ -Ximage:$ANDROID_ROOT/framework/core.art \ |