diff options
Diffstat (limited to 'dependency/VtsVndkDependencyTest.py')
| -rw-r--r-- | dependency/VtsVndkDependencyTest.py | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/dependency/VtsVndkDependencyTest.py b/dependency/VtsVndkDependencyTest.py index 0ad79e7..0302220 100644 --- a/dependency/VtsVndkDependencyTest.py +++ b/dependency/VtsVndkDependencyTest.py @@ -46,8 +46,10 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): /system/lib[64]. _sp_hal: List of patterns. The names of the same-process HAL libraries expected to be in /vendor/lib[64]. - _vndk: Set of strings. The names of VNDK-core libraries. - _vndk_sp: Set of strings. The names of VNDK-SP libraries. + _vndk: Set of strings. The names of VNDK core libraries in + /system/lib[64]/vndk-${VER}. + _vndk_sp: Set of strings. The names of VNDK-SP libraries in + /system/lib[64]/vndk-sp-${VER}. _SP_HAL_LINK_PATHS: Format strings of same-process HAL's link paths. _VENDOR_LINK_PATHS: Format strings of vendor processes' link paths. """ @@ -449,26 +451,18 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): if self._dut.is64Bit: dep_errors.extend(self._TestElfDependency(64, objs)) - assert_lines = [] if read_errors: - error_lines = ["%s: %s" % (x[0], x[1]) for x in read_errors] + error_lines = ("%s: %s" % (x[0], x[1]) for x in read_errors) logging.error("%d read errors:\n%s", len(read_errors), "\n".join(error_lines)) - assert_lines.extend(error_lines[:20]) - if dep_errors: - error_lines = ["%s: %s" % (x[0], ", ".join(x[1])) - for x in dep_errors] + error_lines = ("%s: %s" % (x[0], ", ".join(x[1])) + for x in dep_errors) logging.error("%d disallowed dependencies:\n%s", len(dep_errors), "\n".join(error_lines)) - assert_lines.extend(error_lines[:20]) - error_count = len(read_errors) + len(dep_errors) - if error_count: - if error_count > len(assert_lines): - assert_lines.append("...") - assert_lines.append("Total number of errors: " + str(error_count)) - asserts.fail("\n".join(assert_lines)) + asserts.assertEqual(error_count, 0, + "Total number of errors: " + str(error_count)) if __name__ == "__main__": |