summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Chen <twothreecc@google.com>2016-08-09 13:00:18 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-08-10 15:30:27 -0700
commit62af706a02f2b9f59a1f9820b130da905298a8bd (patch)
tree3920aa7808b3573ffcb374aca1109d7dcae021d3
parent59342032e522842566370cdedbee77394e1092ea (diff)
downloadchrome-ec-62af706a02f2b9f59a1f9820b130da905298a8bd.tar.gz
cts: Fixed bug with conflicting error codes
BRANCH=None BUG=None TEST=Manual - Build and run meta tests, look for listed output Change-Id: Idd46fb92791c1d0576be95f3e4cda8cdca66daef Reviewed-on: https://chromium-review.googlesource.com/367401 Commit-Ready: Chris Chen <twothreecc@google.com> Tested-by: Chris Chen <twothreecc@google.com> Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rwxr-xr-xcts/cts.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cts/cts.py b/cts/cts.py
index 6525d3803d..1880ce6018 100755
--- a/cts/cts.py
+++ b/cts/cts.py
@@ -514,6 +514,8 @@ class Cts(object):
test,
CTS_SUCCESS_CODE) == CTS_SUCCESS_CODE:
self.test_results[test] = return_code
+ elif return_code == CTS_SUCCESS_CODE:
+ pass
elif return_code != self.test_results[test]:
self.test_results[test] = CTS_CONFLICTING_CODE
test_num += 1