[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ltp-cvs
Subject:    [Ltp-cvs] ltp/testcases/kernel/power_management change_freq.sh, 1.1,
From:       Subrata <subrata_modak () users ! sourceforge ! net>
Date:       2009-03-25 6:19:24
Message-ID: E1LmMSS-0000VE-64 () ddv4jf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/ltp/ltp/testcases/kernel/power_management
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1870/ltp/testcases/kernel/power_management

Modified Files:
	change_freq.sh change_govr.sh check_config.sh 
	check_cpufreq_sysfs_files.sh check_cpuidle_sysfs_files.sh 
	cpu_consolidation.py pwkm_load_unload.sh runpwtests.sh 
	sched_domain.py test_sched_mc.sh 
Log Message:
Patch to fix testcases exit status issue. Signed-Off-By: Poornima Nayak <mpnayak@linux.vnet.ibm.com>.


Index: cpu_consolidation.py
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/cpu_consolidation.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cpu_consolidation.py	9 Mar 2009 10:27:27 -0000	1.2
--- cpu_consolidation.py	25 Mar 2009 06:19:22 -0000	1.3
***************
*** 32,35 ****
          generate_report()
          validate_cpu_consolidation(options.mc_level)
!     except:
          sys.exit(1)
--- 32,36 ----
          generate_report()
          validate_cpu_consolidation(options.mc_level)
!         sys.exit(0)
!     except Exception:
          sys.exit(1)

Index: change_govr.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/change_govr.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** change_govr.sh	23 Oct 2008 13:31:35 -0000	1.1
--- change_govr.sh	25 Mar 2009 06:19:22 -0000	1.2
***************
*** 22,24 ****
  	echo "${0}: PASS: Changing cpu governors"
  fi
! #return $RC
--- 22,24 ----
  	echo "${0}: PASS: Changing cpu governors"
  fi
! exit $RC

Index: test_sched_mc.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/test_sched_mc.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_sched_mc.sh	23 Oct 2008 13:31:35 -0000	1.1
--- test_sched_mc.sh	25 Mar 2009 06:19:22 -0000	1.2
***************
*** 43,45 ****
  echo "${0}: ---Invalid test cases---"
  check_input "${invalid_input}" invalid
! #return $RC
--- 43,45 ----
  echo "${0}: ---Invalid test cases---"
  check_input "${invalid_input}" invalid
! exit $RC

Index: pwkm_load_unload.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/pwkm_load_unload.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pwkm_load_unload.sh	9 Mar 2009 10:28:35 -0000	1.2
--- pwkm_load_unload.sh	25 Mar 2009 06:19:22 -0000	1.3
***************
*** 2,5 ****
--- 2,6 ----
  
  #Loading modules
+ RC=0
  loaded_governor=`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor`
  for module in cpufreq_conservative cpufreq_powersave cpufreq_userspace
***************
*** 11,14 ****
--- 12,16 ----
  		if [ $? -ne 0 ] ; then
  			echo "${0}: FAIL: Loading of module $module or check whether you compiled as module or not"
+ 			RC=1
  		fi
  	fi
***************
*** 22,26 ****
--- 24,30 ----
  		if [ $? -ne 0 ] ; then
  			echo "${0}: FAIL: Loading of module $module or check whether you compiled as module or not"
+ 			RC=1
  		fi
  	fi
  done
+ exit $RC

Index: runpwtests.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/runpwtests.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** runpwtests.sh	9 Mar 2009 10:26:20 -0000	1.5
--- runpwtests.sh	25 Mar 2009 06:19:22 -0000	1.6
***************
*** 48,52 ****
  
  # Checking required kernel version and architecture
! check_kv_arch || RC=$?
  if [ $RC -eq 1 ] ; then
  	tst_resm TCONF "Kernel version or Architecture not supported:\
--- 48,52 ----
  
  # Checking required kernel version and architecture
! check_kv_arch; RC=$?
  if [ $RC -eq 1 ] ; then
  	tst_resm TCONF "Kernel version or Architecture not supported:\
***************
*** 58,62 ****
  #check_config.sh config_sched_mc || RC=$?
  if [ -f /sys/devices/system/cpu/sched_mc_power_savings ] ; then
! 	test_sched_mc.sh || RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "SCHED_MC sysfs tests failed"
--- 58,62 ----
  #check_config.sh config_sched_mc || RC=$?
  if [ -f /sys/devices/system/cpu/sched_mc_power_savings ] ; then
! 	test_sched_mc.sh; RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "SCHED_MC sysfs tests failed"
***************
*** 68,72 ****
  	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"
--- 68,72 ----
  	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"
***************
*** 75,79 ****
  		fi
          # Validate CPU level sched domain topology validation
!         sched_domain.py || RC=$?
          if [ $RC -eq 1 ] ; then
              tst_resm TFAIL "sched domain topology validation test failed"
--- 75,79 ----
  		fi
          # Validate CPU level sched domain topology validation
!         sched_domain.py; RC=$?
          if [ $RC -eq 1 ] ; then
              tst_resm TFAIL "sched domain topology validation test failed"
***************
*** 81,86 ****
              tst_resm TPASS "sched domain topology validation test passed"
          fi      
- 
-         
  	fi
  else
--- 81,84 ----
***************
*** 88,96 ****
          exit 0
  fi
- 
  # Checking cpufreq sysfs interface files
  #check_config.sh config_cpu_freq || RC=$?
  if [ -d /sys/devices/system/cpu/cpu0/cpufreq ] ; then
! 	check_cpufreq_sysfs_files.sh || RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "CPUFREQ sysfs tests failed"
--- 86,93 ----
          exit 0
  fi
  # Checking cpufreq sysfs interface files
  #check_config.sh config_cpu_freq || RC=$?
  if [ -d /sys/devices/system/cpu/cpu0/cpufreq ] ; then
! 	check_cpufreq_sysfs_files.sh; RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "CPUFREQ sysfs tests failed"
***************
*** 98,102 ****
  
  	# Changing governors
! 	change_govr.sh || RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "Changing governors failed"
--- 95,99 ----
  
  	# Changing governors
! 	change_govr.sh; RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "Changing governors failed"
***************
*** 104,108 ****
  
  	# Changing frequencies
! 	change_freq.sh || RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "Changing frequncies failed"
--- 101,105 ----
  
  	# Changing frequencies
! 	change_freq.sh; RC=$?
  	if [ $RC -eq 1 ] ; then
  		tst_resm TFAIL "Changing frequncies failed"
***************
*** 110,114 ****
  
  	# 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 \
--- 107,111 ----
  
  	# 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 \
***************
*** 120,126 ****
  
  # Checking cpuidle sysfs interface files
! check_cpuidle_sysfs_files.sh || RC=$?
  if [ $RC -eq 1 ] ; then
  	tst_resm TFAIL "CPUIDLE sysfs tests failed"
  fi
- 
--- 117,122 ----
  
  # Checking cpuidle sysfs interface files
! check_cpuidle_sysfs_files.sh; RC=$?
  if [ $RC -eq 1 ] ; then
  	tst_resm TFAIL "CPUIDLE sysfs tests failed"
  fi

Index: check_cpufreq_sysfs_files.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/check_cpufreq_sysfs_files.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** check_cpufreq_sysfs_files.sh	23 Oct 2008 13:31:35 -0000	1.1
--- check_cpufreq_sysfs_files.sh	25 Mar 2009 06:19:22 -0000	1.2
***************
*** 22,24 ****
  	echo "${0}: PASS: Checking cpu freq sysfs files"
  fi
! #return $RC
--- 22,24 ----
  	echo "${0}: PASS: Checking cpu freq sysfs files"
  fi
! exit $RC

Index: check_cpuidle_sysfs_files.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/check_cpuidle_sysfs_files.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** check_cpuidle_sysfs_files.sh	19 Nov 2008 10:56:34 -0000	1.2
--- check_cpuidle_sysfs_files.sh	25 Mar 2009 06:19:22 -0000	1.3
***************
*** 17,19 ****
  	echo "${0}: FAIL: Checking cpu idle sysfs files"
  fi
! #return $RC
--- 17,19 ----
  	echo "${0}: FAIL: Checking cpu idle sysfs files"
  fi
! exit $RC

Index: sched_domain.py
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/sched_domain.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sched_domain.py	9 Mar 2009 10:23:06 -0000	1.1
--- sched_domain.py	25 Mar 2009 06:19:22 -0000	1.2
***************
*** 23,26 ****
          set_sched_mc_power(0)
          verify_sched_domain_dmesg(0)
!     except:
          sys.exit(1)
--- 23,27 ----
          set_sched_mc_power(0)
          verify_sched_domain_dmesg(0)
!         sys.exit(0)
!     except Exception:
          sys.exit(1)

Index: change_freq.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/change_freq.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** change_freq.sh	23 Oct 2008 13:31:35 -0000	1.1
--- change_freq.sh	25 Mar 2009 06:19:22 -0000	1.2
***************
*** 34,36 ****
  	echo "${0}: PASS: Changing cpu frequencies"
  fi
! #return $RC
--- 34,36 ----
  	echo "${0}: PASS: Changing cpu frequencies"
  fi
! exit $RC

Index: check_config.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/check_config.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** check_config.sh	23 Oct 2008 13:31:35 -0000	1.1
--- check_config.sh	25 Mar 2009 06:19:22 -0000	1.2
***************
*** 30,32 ****
  	check_config_options "${config_option}=*" ${config_file} ${grep_command}
  done < ${filename}
! #return ${RC}
--- 30,32 ----
  	check_config_options "${config_option}=*" ${config_file} ${grep_command}
  done < ${filename}
! exit $RC


------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Ltp-cvs mailing list
Ltp-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-cvs
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic