aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Fjeldtvedt <jaffe1@gmail.com>2016-07-22 12:20:16 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2016-07-22 12:38:55 +0200
commitb46a501570b1cdb1a493997e465a5f4c0bfabb89 (patch)
tree5c2f643e386d27362c9179b2ef2ed739208a94a1
parenta8c26d82ec2173979d322d34c46d014ae637c232 (diff)
cec-compliance: ARC Rx terminate test is OK if reply was received
This cleans up the ARC Rx terminate test and makes it return 0 when OK and PRESUMED_OK when no reply was received back after sending the request. Signed-off-by: Johan Fjeldtvedt <jaffe1@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
-rw-r--r--utils/cec-compliance/cec-test-audio.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/utils/cec-compliance/cec-test-audio.cpp b/utils/cec-compliance/cec-test-audio.cpp
index 4a8e6105..0915261e 100644
--- a/utils/cec-compliance/cec-test-audio.cpp
+++ b/utils/cec-compliance/cec-test-audio.cpp
@@ -288,18 +288,17 @@ static int arc_terminate_rx(struct node *node, unsigned me, unsigned la, bool in
cec_msg_init(&msg, me, la);
cec_msg_request_arc_termination(&msg, true);
fail_on_test(!transmit_timeout(node, &msg));
- if (timed_out(&msg))
+ if (timed_out(&msg)) {
warn("Timed out waiting for Terminate ARC.\n");
+ return PRESUMED_OK;
+ }
fail_on_test(cec_msg_status_is_abort(&msg));
cec_msg_init(&msg, me, la);
cec_msg_report_arc_terminated(&msg);
fail_on_test(!transmit(node, &msg));
- warn("The termination request timed out.\n");
- if (cec_msg_status_is_abort(&msg))
- warn("The termination request was feature aborted.\n");
- return PRESUMED_OK;
+ return 0;
}
struct remote_subtest arc_subtests[] = {

Privacy Policy