It is only checked for PRESUMED_OK and REFUSED when performing remote
tests, but these test result codes are also used elsewhere, so checking
for them is moved to the ok function.
Signed-off-by: Johan Fjeldtvedt <jaffe1@xxxxxxxxx>
---
utils/cec-compliance/cec-compliance.cpp | 9 +++++++--
utils/cec-compliance/cec-test.cpp | 4 ----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/utils/cec-compliance/cec-compliance.cpp b/utils/cec-compliance/cec-compliance.cpp
index 519c572..ccfa3ba 100644
--- a/utils/cec-compliance/cec-compliance.cpp
+++ b/utils/cec-compliance/cec-compliance.cpp
@@ -842,9 +842,14 @@ const char *ok(int res)
if (res == NOTSUPPORTED) {
strcpy(buf, "OK (Not Supported)");
res = 0;
- } else {
+ } else if (res == PRESUMED_OK) {
+ strcpy(buf, "OK (Presumed)");
+ res = 0;
+ } else if (res == REFUSED) {
+ strcpy(buf, "OK (Refused)");
+ res = 0;
+ } else
strcpy(buf, "OK");
- }
tests_total++;
if (res) {
app_result = res;
diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp
index 5fac04a..07ba4b6 100644
--- a/utils/cec-compliance/cec-test.cpp
+++ b/utils/cec-compliance/cec-test.cpp
@@ -1479,10 +1479,6 @@ void testRemote(struct node *node, unsigned me, unsigned la, unsigned test_tags,
printf("\t %s: OK (Unexpected)\n",
tests[i].subtests[j].name);
}
- else if (ret == PRESUMED_OK)
- printf("\t %s: OK (Presumed)\n", tests[i].subtests[j].name);
- else if (ret == REFUSED)
- printf("\t %s: OK (Refused)\n", tests[i].subtests[j].name);
else if (ret != NOTAPPLICABLE)
printf("\t %s: %s\n", tests[i].subtests[j].name, ok(ret));
if (ret == FAIL_CRITICAL)
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
