Merge lp:~asac/lava-dispatcher/lava-test-case-exit-code-fix into lp:lava-dispatcher

Proposed by Alexander Sack
Status: Merged
Merged at revision: 505
Proposed branch: lp:~asac/lava-dispatcher/lava-test-case-exit-code-fix
Merge into: lp:lava-dispatcher
Diff against target: 13 lines (+5/-1)
1 file modified
lava_test_shell/lava-test-case (+5/-1)
To merge this branch: bzr merge lp:~asac/lava-dispatcher/lava-test-case-exit-code-fix
Reviewer Review Type Date Requested Status
Linaro Validation Team Pending
Review via email: mp+140446@code.launchpad.net

Description of the change

=== modified file 'lava_test_shell/lava-test-case'
--- lava_test_shell/lava-test-case 2012-12-04 22:20:34 +0000
+++ lava_test_shell/lava-test-case 2012-12-18 13:40:24 +0000
@@ -74,4 +74,8 @@
 if [ -n "${MEASUREMENT+x}" ]; then
     echo $MEASUREMENT > $result_dir/measurement
 fi
-exit $rc
+
+# lava-test-case testname --shell false should report a fail as test result
+# but not fail itself; hence don't honor 'rc' if we reach this, but exit 0
+exit 0
+

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_test_shell/lava-test-case'
2--- lava_test_shell/lava-test-case 2012-12-04 22:20:34 +0000
3+++ lava_test_shell/lava-test-case 2012-12-18 13:44:21 +0000
4@@ -74,4 +74,8 @@
5 if [ -n "${MEASUREMENT+x}" ]; then
6 echo $MEASUREMENT > $result_dir/measurement
7 fi
8-exit $rc
9+
10+# lava-test-case testname --shell false should report a fail as test result
11+# but not fail itself; hence don't honor 'rc' if we reach this, but exit 0
12+exit 0
13+

Subscribers

People subscribed via source and target branches