Re: [LTP] [PATCH 04/05]: Patch to integrate cpu consolidation testcase to LTP

[Subrata M. <su...@li...>]

On Sat, 2009-02-28 at 15:46 +0530, Poornima Nayak wrote:
> Signed-off-by: poo...@in...

Merged.

> 
> diff -uprN power_management_orig/Makefile power_management/Makefile
> --- power_management_orig/Makefile  2009-02-27 17:14:50.000000000 -0600
> +++ power_management/Makefile 2009-02-27 17:20:58.000000000 -0600
> @@ -18,8 +18,11 @@
>  ##
> ##
> 
> ################################################################################
> 
> -all:
> -     @set -e; $(MAKE) check_kv_arch ;
> +SUBDIRS :=
> +
> +all:
> +     @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
> +     $(MAKE) check_kv_arch ;
> 
>  check_kv_arch: check_kv_arch.c
>       $(CC) -o $@ $< ../../../lib/tst_kvercmp.c -I../../../include
> @@ -38,7 +41,9 @@ install:
>       ln -f  config_cpu_idle ../../bin/config_cpu_idle; \
>       ln -f  config_sched_mc ../../bin/config_sched_mc;
>       ln -f  check_cpuidle_sysfs_files.sh
> ../../bin/check_cpuidle_sysfs_files.sh;
> +     ln -f  cpu_consolidation.py ../../bin/cpu_consolidation.py
>       chmod ugo+x *.sh
>  clean:
> +     @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@ ; done
>       rm -f check_kv_arch
> 
> diff -uprN power_management_orig/runpwtests.sh
> power_management/runpwtests.sh
> --- power_management_orig/runpwtests.sh   2009-02-27 17:14:50.000000000
> -0600
> +++ power_management/runpwtests.sh  2009-02-27 17:21:08.000000000 -0600
> @@ -33,7 +33,6 @@
> 
>  export TST_TOTAL=1
>  LTPTMP=${TMP}
> -LTPROOT=../../bin
>  export PATH=${PATH}:.
>  export TCID="Power Management"
>  export TST_COUNT=0
> @@ -50,7 +49,8 @@ RC=0        #Return status
>  # Checking required kernel version and architecture
>  check_kv_arch || RC=$?
>  if [ $RC -eq 1 ] ; then
> -     tst_resm TCONF "Kernel version or Architecture not supported: Not
> running testcases"
> +     tst_resm TCONF "Kernel version or Architecture not supported:\
> +     Not running testcases"
>       exit 0
>  fi
> 
> @@ -61,6 +61,19 @@ if [ -f /sys/devices/system/cpu/sched_mc
>       if [ $RC -eq 1 ] ; then
>             tst_resm TFAIL "SCHED_MC sysfs tests failed"
>       fi
> +     # Test CPU consolidation for corresponding sched_mc
> +     which python > /dev/null
> +     if [ $? -ne 0 ] ; then
> +     tst_resm TCONF "Python is not installed, CPU Consoldation test not
> run"
> +     else
> +           # Trigger ebizzy workload for sched_mc_power_saving 1
> +           cpu_consolidation.py -w ebizzy -l 1 || RC=$?
> +           if [ $RC -eq 1 ] ; then
> +           tst_resm TFAIL "cpu consolidation test failed"
> +           else
> +             tst_resm TPASS "cpu consolidation test for sched_mc_power set
> to 1"
> +           fi
> +     fi
>  else
>       tst_resm TCONF "Required kernel configuration for SCHED_MC NOT set"
>          exit 0
> @@ -89,11 +102,11 @@ if [ -d /sys/devices/system/cpu/cpu0/cpu
>       # Loading and Unloading governor related kernel modules
>       pwkm_load_unload.sh || RC=$?
>       if [ $RC -eq 1 ] ; then
> -           tst_resm TFAIL "Loading and Unloading of governor kernel
> modules got failed"
> +           tst_resm TFAIL "Loading and Unloading of governor kernel \
> +           modules got failed"
>       fi
>  else
>         tst_resm TCONF "Required kernel configuration for CPU_FREQ NOT set"
> -       exit 0
>  fi
> 
>  # Checking cpuidle sysfs interface files
> @@ -101,4 +114,3 @@ check_cpuidle_sysfs_files.sh || RC=$?
>  if [ $RC -eq 1 ] ; then
>       tst_resm TFAIL "CPUIDLE sysfs tests failed"
>  fi
> -
> 
> 
> ------------------------------------------------------------------------------
> Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
> -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
> -Strategies to boost innovation and cut costs with open source participation
> -Receive a $600 discount off the registration fee with the source code: SFAD
> http://p.sf.net/sfu/XcvMzF8H
> _______________________________________________
> Ltp-list mailing list
> Ltp...@li...
> https://lists.sourceforge.net/lists/listinfo/ltp-list