aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjay Singh Rawat <sanjay.rawat@linaro.org>2013-06-19 18:59:36 +0530
committerSanjay Singh Rawat <sanjay.rawat@linaro.org>2013-06-21 09:14:52 +0530
commitb579c109263adf0e599dd2becf6115317f13d8da (patch)
treef65b908d5aedd75f1d37ac34dcbddf150ad87016
parent83b26137ccc5ae29c8fb10a090ecf18c647f80b7 (diff)
pm-qa: export variables and copy switch file in outdir
- Export switch variables from a script file - Update Android.mk to copy the switch file to out directory. Currently switch file is missing in android. Signed-off-by: Sanjay Singh Rawat <sanjay.rawat@linaro.org>
-rw-r--r--Android.mk10
-rw-r--r--Switches11
-rw-r--r--Switches.sh11
-rw-r--r--include/functions.sh2
4 files changed, 22 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index 5053e7d..b3f12f6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1 +1,11 @@
include $(call all-subdir-makefiles)
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := tests
+LOCAL_MODULE := Switches.sh
+LOCAL_SRC_FILES := ../../external/pm-qa/Switches.sh
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa
+include $(BUILD_PREBUILT)
diff --git a/Switches b/Switches
deleted file mode 100644
index 3a46ffe..0000000
--- a/Switches
+++ /dev/null
@@ -1,11 +0,0 @@
-# These are switches to enable/disable some tests.
-
-# Thermal tests
-thermal_try_max=0
-
-# Suspend tests
-suspend_dbus=0
-suspend_pmsuspend=1
-suspend_mem=1
-suspend_ac=0
-suspend_power=0
diff --git a/Switches.sh b/Switches.sh
new file mode 100644
index 0000000..cc59992
--- /dev/null
+++ b/Switches.sh
@@ -0,0 +1,11 @@
+# These are switches to enable/disable some tests.
+
+# Thermal tests
+export thermal_try_max=0
+
+# Suspend tests
+export suspend_dbus=0
+export suspend_pmsuspend=1
+export suspend_mem=1
+export suspend_ac=0
+export suspend_power=0
diff --git a/include/functions.sh b/include/functions.sh
index fa9a370..874d2d2 100644
--- a/include/functions.sh
+++ b/include/functions.sh
@@ -23,7 +23,7 @@
# - initial API and implementation
#
-source ../Switches
+source ../Switches.sh
CPU_PATH="/sys/devices/system/cpu"
TEST_NAME=$(basename ${0%.sh})