Merge lp:~roadmr/checkbox/phoronix-verbose-output into lp:checkbox

[Daniel Manrique]

changes to log the full phoronix console output as the comment, this will ease debugging and will be clearer than the current output, which is just a number representing FPS. Without context this number is a bit hard to interpret.

This doesn't entirely fix the linked bug, but that bug showed that without proper information it's very painful and slow to debug problems like the one reported.

[Zygmunt Krynicki (zyga)]

Looks good, crappy phoronix

review: Approve

[Zygmunt Krynicki (zyga)]

NOTE: it would be really awesome if we could get integration tests for that, would you want to work on one with me? It's really easy to do I hope (if not, I want to know)

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-31 00:29:39 +0000
+++ debian/changelog	2013-01-31 20:10:35 +0000
@@ -4,6 +4,8 @@
   * Bumped revision number to 0.15.1 and restored previous trunk changelog.
   * jobs/peripheral.txt.in: fixed string with repeated "add" (LP: #1102665) 
   * scripts/graphics_stress_test: added missing import (LP: #1102812)
+  * scripts/pts_run: modified to output the full log from phoronix-test-suite
+    (LP: #1102819)
 
   [ Jeff Lane ]
   * scripts/rendercheck_test - added missing import for errno (LP: #1103343)
 
=== modified file 'scripts/pts_run'
--- scripts/pts_run	2012-10-09 10:00:34 +0000
+++ scripts/pts_run	2013-01-31 20:10:35 +0000
@@ -15,6 +15,20 @@
 # Run only the following resolution
 export OVERRIDE_VIDEO_MODES=800x600
 
+set +o errexit
+rv=0
 output=$(phoronix-test-suite batch-benchmark $@ 2>&1)
-echo $output | grep -q -i 'This test failed to run properly'
-echo $output | sed 's/.*Average: //'
+#The output does NOT report success. It may contain, if it fails:
+# The test did not produce a result
+# The test failed to run properly
+# Failed to Fetch
+
+if (echo "$output" | grep -q -i "Failed to fetch" ); then 
+	rv=1
+fi
+if ( echo "$output" | grep -q -i 'This test failed to run properly'); then 
+	rv=1
+fi
+echo "$output"
+exit $rv
+