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

Proposed by Daniel Manrique on 2013-01-31
Status: Merged
Approved by: Zygmunt Krynicki on 2013-02-04
Approved revision: 1907
Merged at revision: 1908
Proposed branch: lp:~roadmr/checkbox/phoronix-verbose-output
Merge into: lp:checkbox
Diff against target: 39 lines (+18/-2)
2 files modified
debian/changelog (+2/-0)
scripts/pts_run (+16/-2)
To merge this branch: bzr merge lp:~roadmr/checkbox/phoronix-verbose-output
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2013-01-31 Approve on 2013-02-04
Review via email: mp+145966@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

Looks good, crappy phoronix

review: Approve
Zygmunt Krynicki (zyga) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-31 00:29:39 +0000
3+++ debian/changelog 2013-01-31 20:10:35 +0000
4@@ -4,6 +4,8 @@
5 * Bumped revision number to 0.15.1 and restored previous trunk changelog.
6 * jobs/peripheral.txt.in: fixed string with repeated "add" (LP: #1102665)
7 * scripts/graphics_stress_test: added missing import (LP: #1102812)
8+ * scripts/pts_run: modified to output the full log from phoronix-test-suite
9+ (LP: #1102819)
10
11 [ Jeff Lane ]
12 * scripts/rendercheck_test - added missing import for errno (LP: #1103343)
13
14=== modified file 'scripts/pts_run'
15--- scripts/pts_run 2012-10-09 10:00:34 +0000
16+++ scripts/pts_run 2013-01-31 20:10:35 +0000
17@@ -15,6 +15,20 @@
18 # Run only the following resolution
19 export OVERRIDE_VIDEO_MODES=800x600
20
21+set +o errexit
22+rv=0
23 output=$(phoronix-test-suite batch-benchmark $@ 2>&1)
24-echo $output | grep -q -i 'This test failed to run properly'
25-echo $output | sed 's/.*Average: //'
26+#The output does NOT report success. It may contain, if it fails:
27+# The test did not produce a result
28+# The test failed to run properly
29+# Failed to Fetch
30+
31+if (echo "$output" | grep -q -i "Failed to fetch" ); then
32+ rv=1
33+fi
34+if ( echo "$output" | grep -q -i 'This test failed to run properly'); then
35+ rv=1
36+fi
37+echo "$output"
38+exit $rv
39+

Subscribers

People subscribed via source and target branches