diff options
| author | 2016-09-22 22:55:58 +0100 | |
|---|---|---|
| committer | 2016-09-22 22:56:29 +0100 | |
| commit | f13a365f48f9a136dc0859373f449ff521f47ade (patch) | |
| tree | 93ce8f1c5f15d342bb81790b7c74d1eb415672e9 | |
| parent | 79bd5992aef92769f4226a27d8b77b072ca98e4b (diff) | |
Use android_root instead of hard coded /system in test script.
The buildbot uses its own ANDROID_ROOT.
Spotted while debugging 902 test failures on target.
Change-Id: I9b2047ce510e93f205771f7384f644450b0325e6
| -rwxr-xr-x | test/run-test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/run-test b/test/run-test index 250263a928..c50a9ca707 100755 --- a/test/run-test +++ b/test/run-test @@ -476,7 +476,7 @@ elif [ "$runtime" = "art" ]; then run_args="${run_args} --runtime-option -Djava.library.path=${ANDROID_HOST_OUT}/lib${suffix64}:${ANDROID_HOST_OUT}/nativetest${suffix64}" else guess_target_arch_name - run_args="${run_args} --runtime-option -Djava.library.path=/data/nativetest${suffix64}/art/${target_arch_name}:/system/lib${suffix64}" + run_args="${run_args} --runtime-option -Djava.library.path=/data/nativetest${suffix64}/art/${target_arch_name}:${android_root}/lib${suffix64}" run_args="${run_args} --boot /data/art-test/core${image_suffix}${pic_image_suffix}${multi_image_suffix}.art" fi if [ "$relocate" = "yes" ]; then |