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

[Brendan Donegan]

cpu/frequency_governors and stress/graphics tests were attempting to use CHECKBOX_DATA in their commands. If the command is run as root then it is necessary to specify CHECKBOX_DATA in the environment field for the value to be passed through to the sudo environment.

[Zygmunt Krynicki (zyga)]

+1

Thanks for teaching me about it

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-12 12:54:24 +0000
+++ debian/changelog	2012-09-12 13:33:23 +0000
@@ -77,6 +77,9 @@
   * scripts/frequency_governors_test - Ensure that check for difference in
     expected and actual speedup only fails if the actual speedup is less than
     the expected speedup (LP: #999547)
+  * jobs/cpu.txt.in, jobs/stress.txt.in - add environ field containing
+    CHECKBOX_DATA to allow that environment variable to be used in the command
+    (LP: #1049595)
 
   [Sylvain Pineau]
   * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid

=== modified file 'jobs/cpu.txt.in'
--- jobs/cpu.txt.in	2012-08-13 07:15:53 +0000
+++ jobs/cpu.txt.in	2012-09-12 13:33:23 +0000
@@ -4,6 +4,7 @@
  package.name == 'linux'
  package.name == 'fwts'
 user: root
+environ: CHECKBOX_DATA
 command: fwts_test -c -l ${CHECKBOX_DATA}/scaling_test.log
 _description:
  Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).

=== modified file 'jobs/stress.txt.in'
--- jobs/stress.txt.in	2012-09-12 11:41:55 +0000
+++ jobs/stress.txt.in	2012-09-12 13:33:23 +0000
@@ -132,6 +132,7 @@
 requires:
  package.name == 'x11-apps'
 user: root
+environ: CHECKBOX_DATA
 command: graphics_stress_test -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
 _description:
  Run the graphics stress test. This test can take a few minutes.