Merge lp:~brendan-donegan/checkbox/bug926136_cpu_offlining into lp:checkbox

[Brendan Donegan]

There were failures observed when running the cpu/offlining test on any system with more than ten cores. Turns out this was simply down to the grep used to check if the core was online not taking into account that CPU1 will also match on CPU11. Updated the grep to match a whole word only. Also changed the logic so that the script doesn't exit until the very end when all cores have been onlined again.

[Brendan Donegan (brendan-donegan)]

This should take care of the problem essentially. Colin King suggested a few more sanity checks which we could do, but they aren't strictly necessary to fix the bug itself.

[Daniel Manrique (roadmr)]

This looks OK. I'd like to see Colin's suggestions rolled in at some point, but for now I'll merge this.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-24 13:45:56 +0000
+++ debian/changelog	2012-04-26 07:45:23 +0000
@@ -1,5 +1,7 @@
 checkbox (0.13.8) precise; urgency=low
-
+  [Brendan Donegan]
+  * Fixed cpu_offlining to work properly on systems with ten or more CPU
+    cores. (LP: #926136)
   [Nathan Williams]
   * fix typo in jobs/optical.txt.in (lp: #987652)
 

=== modified file 'scripts/cpu_offlining'
--- scripts/cpu_offlining	2012-01-25 10:22:35 +0000
+++ scripts/cpu_offlining	2012-04-26 07:45:23 +0000
@@ -1,16 +1,20 @@
 #!/bin/bash
 
 echo "Beginning CPU Offlining Test"
+
+result=0
+
 # Turn CPU cores off
 for cpu_num in `ls /sys/devices/system/cpu | grep -o cpu[0-9]*`;
 do
 	if [ -f /sys/devices/system/cpu/$cpu_num/online ]; then
         echo "Offlining $cpu_num"
 		echo 0 > /sys/devices/system/cpu/$cpu_num/online
-		grep -i -q $cpu_num /proc/interrupts
+
+		grep -w -i -q $cpu_num /proc/interrupts
 
 		if [ $? == 0 ]; then
-			exit 1
+			result=1
 		fi
 	fi
 done
@@ -21,10 +25,12 @@
     if [ -f /sys/devices/system/cpu/$cpu_num/online ]; then
         echo "Onlining $cpu_num"
         echo 1 > /sys/devices/system/cpu/$cpu_num/online
-        grep -i -q $cpu_num /proc/interrupts
+        grep -w -i -q $cpu_num /proc/interrupts
 
         if [ $? == 1 ]; then
-            exit 1
+            result=1
         fi
     fi
 done
+
+exit $result