Author: gnichols Date: 2011-03-23 16:17:23 +0000 (Wed, 23 Mar 2011) New Revision: 828

Modified: trunk/tests/cpuscaling/cpuscaling.py Log: 690198 - cpuscaling test can fail a package, and still pass the system

Modified: trunk/tests/cpuscaling/cpuscaling.py =================================================================== --- trunk/tests/cpuscaling/cpuscaling.py 2011-03-23 16:13:47 UTC (rev 827) +++ trunk/tests/cpuscaling/cpuscaling.py 2011-03-23 16:17:23 UTC (rev 828) @@ -561,7 +561,7 @@ for cpu in self.packageToCpus[self.currentPackage]: if self.getWorkloadTime("maximum", cpu): self.differenceOnDemandVsMaximum = self.margin(cpu, "ondemand") - print "Percentage Difference vs. maximum frequency: %.1f%%" % self.differenceOnDemandVsMaximum + print "CPU %s Percentage Difference vs. maximum frequency: %.1f%%" % (cpu, self.differenceOnDemandVsMaximum) if self.differenceOnDemandVsMaximum > self.speedUpTolerance: print "Error: on demand performance vs maximum of %.1f%% is not within %.1f%% margin" % (self.differenceOnDemandVsMaximum, self.speedUpTolerance) success = False @@ -610,7 +610,7 @@ # 23. Compare the timing to the max results for a self.speedUpTolerance delta for cpu in self.packageToCpus[self.currentPackage]: self.differencePerformanceVsMaximum = self.margin(cpu, "performance") - print "Percentage Difference vs. maximum frequency: %.1f%%" % self.differencePerformanceVsMaximum + print "CPU %s Percentage Difference vs. maximum frequency: %.1f%%" % (cpu, self.differencePerformanceVsMaximum) if self.differencePerformanceVsMaximum > self.speedUpTolerance: print "Error: performance setting vs maximum of %.1f%% is not within %.1f%% margin" % (self.differencePerformanceVsMaximum, self.speedUpTolerance) success = False @@ -769,9 +769,11 @@ PASSED = 0 FAILED = 1

+ if not self.runSubTest(self.getSystemCapabilities, "Capabilities"): return FAILED

+ result = PASSED for package in self.packageToCpus.keys():

print "Testing CPU Package " + package @@ -779,8 +781,6 @@

self.waitForLull()

- result = PASSED - if not self.runSubTest(self.runUserSpaceTests, "User Space, package %s" % package): result = FAILED

@@ -799,11 +799,9 @@ self.restoreGovernors()

if not self.runSubTest(self.runSummary, "Summary"): - result = FAILED + result = FAILED

-

- return result

class LoadProcess: