From 3043506d865e25286150e5d239a6ef9b09842773 Mon Sep 17 00:00:00 2001
From: Sergei Trofimov <sergei.trofimov@arm.com>
Date: Wed, 23 Mar 2016 16:28:18 +0000
Subject: [PATCH] applaunch: pass the location of busybox into the script

applaunch creates and deploys an auxilary script in order to collect
precise timings. This script invoked busybox with the assumption that it
is in PATH.

Since recent changes mean that it is no longer deployed to /system/bin,
the busybox in not found. With this commit, the full path to busybox
will be passed into the script's template.
---
 wlauto/workloads/applaunch/__init__.py            | 1 +
 wlauto/workloads/applaunch/device_script.template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wlauto/workloads/applaunch/__init__.py b/wlauto/workloads/applaunch/__init__.py
index c6360657..40dcb7b7 100644
--- a/wlauto/workloads/applaunch/__init__.py
+++ b/wlauto/workloads/applaunch/__init__.py
@@ -116,6 +116,7 @@ class ApplaunchWorkload(Workload):
                                       package=APP_CONFIG[self.app]['package'],
                                       activity=APP_CONFIG[self.app]['activity'],
                                       options=APP_CONFIG[self.app]['options'],
+                                      busybox=self.device.busybox,
                                       ))
         self.device_script_file = self.device.install(self.host_script_file)
         if self.set_launcher_affinity:
diff --git a/wlauto/workloads/applaunch/device_script.template b/wlauto/workloads/applaunch/device_script.template
index 43207aac..1e940d70 100644
--- a/wlauto/workloads/applaunch/device_script.template
+++ b/wlauto/workloads/applaunch/device_script.template
@@ -42,7 +42,7 @@ $STOP_COMMAND
 echo {{ io_scheduler }} > /sys/block/mmcblk0/queue/scheduler
 {% endif %}
 
-for i in $(busybox seq 1 {{ iterations }})
+for i in $({{ busybox }} seq 1 {{ iterations }})
 do
     {% for sensor in sensors %}
     {{ sensor.label }}="${{ sensor.label }} `$GET_{{ sensor.label }}`"
@@ -52,9 +52,9 @@ do
     # Drop caches to get a cold start.
     sync; echo 3 > /proc/sys/vm/drop_caches
     # Run IO stress during App launch.
-    busybox dd if=/dev/zero of=write.img bs=1048576 count=2000 conv=fsync > dd_write.txt 2>&1 &
+    {{ busybox }} dd if=/dev/zero of=write.img bs=1048576 count=2000 conv=fsync > dd_write.txt 2>&1 &
     io_write=$!
-    busybox dd if=/dev/block/mmcblk0 of=/dev/null bs=1048576 > dd_read.txt 2>&1 &
+    {{ busybox }} dd if=/dev/block/mmcblk0 of=/dev/null bs=1048576 > dd_read.txt 2>&1 &
     io_read=$!
     {% endif %}
 
@@ -64,7 +64,7 @@ do
     {{ sensor.label }}="${{ sensor.label }} `$GET_{{ sensor.label }}`"
     {% endfor %}
 
-    TIME=`busybox awk '{if($1~"TotalTime") print $2}' $TEMP_FILE`
+    TIME=`{{ busybox }} awk '{if($1~"TotalTime") print $2}' $TEMP_FILE`
     TIME_RESULT="$TIME_RESULT $TIME"
     {% if cleanup %}
     rm $TEMP_FILE