summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMilosz Wasilewski <milosz.wasilewski@linaro.org>2016-01-21 11:01:56 +0000
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2016-01-21 11:12:40 +0000
commit85aed83f422d1f35b3f37aeafa54e09cec93db5f (patch)
treebdd06596cabaa10540cc8bad1c7c4733c405aa07 /android
parentec2ec80d0adbcba0acb6473699283c51796892ea (diff)
android: fix failing art-microbenchmarks adb
adb sometimes fails when executing command on target device in the setup phase of the test. The failure doesn't looks as preventing the test from continuing, so adding a workaround for bad return code. This will make LAVA not to stop test-shell. Change-Id: Id28d3323bed1f73506413e00340a492ad1d380e9 Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Diffstat (limited to 'android')
-rw-r--r--android/art-microbenchmarks.yaml2
-rwxr-xr-xandroid/scripts/configure-nexus9-for-benchmarks.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/android/art-microbenchmarks.yaml b/android/art-microbenchmarks.yaml
index 1f20733..4f5e5f3 100644
--- a/android/art-microbenchmarks.yaml
+++ b/android/art-microbenchmarks.yaml
@@ -34,7 +34,7 @@ run:
- then
- if [ -f ./android/scripts/configure-$TARGET_DEVICE-for-benchmarks.sh ]
- then
- - . ./android/scripts/configure-$TARGET_DEVICE-for-benchmarks.sh
+ - . ./android/scripts/configure-$TARGET_DEVICE-for-benchmarks.sh || true
- fi
- ./art-testing/run.py -t $IPADDR --iterations $ITERATIONS --mode $MODE --output-pkl $PWD/art-microbenchmarks.pkl --output-json $PWD/art-microbenchmarks.json | tee logs.txt
- . ./android/scripts/parse-ubenchmarks-results.sh logs.txt
diff --git a/android/scripts/configure-nexus9-for-benchmarks.sh b/android/scripts/configure-nexus9-for-benchmarks.sh
index 8fb47cb..802722f 100755
--- a/android/scripts/configure-nexus9-for-benchmarks.sh
+++ b/android/scripts/configure-nexus9-for-benchmarks.sh
@@ -4,5 +4,8 @@ echo "configuring Nexus9 on: $IPADDR"
adb -s $IPADDR wait-for-device
adb -s $IPADDR shell stop
adb -s $IPADDR shell "echo userspace > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
+sleep 2
adb -s $IPADDR shell "echo 1224000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq"
+sleep 2
adb -s $IPADDR shell "echo 1224000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq"
+sleep 2