On Tue, Jan 20, 2015 at 6:06 AM, Lisa Nguyen <lisa.ngu...@linaro.org> wrote: > Update the Android makefiles in cputopology and cpuhotplug > since a few subtests have been added or renamed. Remove > unnecessary whitespace detected by checkpatch as well.
Have you ensured that the test spec[1] corresponds to the current script numbering? [1] https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQaSpecification > Signed-off-by: Lisa Nguyen <lisa.ngu...@linaro.org> > --- > cpufreq/Android.mk | 2 +- > cpuhotplug/Android.mk | 18 ++---------------- > cpuidle/Android.mk | 4 ++-- > cputopology/Android.mk | 2 +- > 4 files changed, 6 insertions(+), 20 deletions(-) > > diff --git a/cpufreq/Android.mk b/cpufreq/Android.mk > index 15d6d9e..4f1bd34 100644 > --- a/cpufreq/Android.mk > +++ b/cpufreq/Android.mk > @@ -5,7 +5,7 @@ module_name = cpufreq > > define $(module_name)_add_executable > include $(CLEAR_VARS) > - LOCAL_MODULE_TAGS := optional > + LOCAL_MODULE_TAGS := optional > LOCAL_MODULE_CLASS := tests > LOCAL_MODULE := $1.sh > systemtarball: $1.sh > diff --git a/cpuhotplug/Android.mk b/cpuhotplug/Android.mk > index fabb70a..e74170f 100644 > --- a/cpuhotplug/Android.mk > +++ b/cpuhotplug/Android.mk > @@ -5,7 +5,7 @@ module_name = cpuhotplug > > define $(module_name)_add_executable > include $(CLEAR_VARS) > - LOCAL_MODULE_TAGS := optional > + LOCAL_MODULE_TAGS := optional > LOCAL_MODULE_CLASS := tests > LOCAL_MODULE := $1.sh > systemtarball: $1.sh > @@ -14,19 +14,5 @@ define $(module_name)_add_executable > include $(BUILD_PREBUILT) > endef > > -test_num := sanity 01 02 03 04 05 06 07 08 > +test_num := sanity 00 01 02 03 04 05 06 07 08 09 > $(foreach item,$(test_num),$(eval $(call $(module_name)_add_executable, > $(module_name)_$(item)))) > - > -define $(module_name)_etc_add_executable > - include $(CLEAR_VARS) > - LOCAL_MODULE_TAGS := optional > - LOCAL_MODULE_CLASS := tests > - LOCAL_MODULE := $1.sh > - systemtarball: $1.sh > - LOCAL_SRC_FILES := $1.sh > - LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name) > - include $(BUILD_PREBUILT) > -endef > - > -test_names := 1_sanity_check z_sanity_check > -$(foreach item,$(test_names),$(eval $(call > $(module_name)_etc_add_executable, $(item)))) > diff --git a/cpuidle/Android.mk b/cpuidle/Android.mk > index 1d1292c..cf22f18 100644 > --- a/cpuidle/Android.mk > +++ b/cpuidle/Android.mk > @@ -5,7 +5,7 @@ module_name = cpuidle > > define $(module_name)_add_executable > include $(CLEAR_VARS) > - LOCAL_MODULE_TAGS := optional > + LOCAL_MODULE_TAGS := optional > LOCAL_MODULE_CLASS := tests > LOCAL_MODULE := $1.sh > systemtarball: $1.sh > @@ -21,7 +21,7 @@ include $(CLEAR_VARS) > LOCAL_MODULE := cpuidle_killer > systemtarball: cpuidle_killer > LOCAL_SRC_FILES:= cpuidle_killer.c > -LOCAL_STATIC_LIBRARIES := libcutils libc > +LOCAL_STATIC_LIBRARIES := libcutils libc > LOCAL_MODULE_TAGS := tests > LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name) > include $(BUILD_EXECUTABLE) > diff --git a/cputopology/Android.mk b/cputopology/Android.mk > index d5b5480..3555496 100644 > --- a/cputopology/Android.mk > +++ b/cputopology/Android.mk > @@ -14,5 +14,5 @@ define $(module_name)_add_executable > include $(BUILD_PREBUILT) > endef > > -test_num := 01 02 > +test_num := sanity 01 02 > $(foreach item,$(test_num),$(eval $(call $(module_name)_add_executable, > $(module_name)_$(item)))) > -- > 1.7.9.5 > _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
