diff options
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | TEST_MAPPING | 10 | ||||
| -rw-r--r-- | files/vts_vndk_files_test.py | 18 | ||||
| -rw-r--r-- | golden/Android.bp | 4 |
4 files changed, 24 insertions, 22 deletions
@@ -27,14 +27,6 @@ python_library_host { ":vndk_lib_lists", ":vndk_lib_extra_lists" ], - version: { - py2: { - enabled: true, - }, - py3: { - enabled: true, - }, - }, } python_defaults { @@ -44,11 +36,7 @@ python_defaults { "vts_vndk_utils", ], version: { - py2: { - enabled: false, - }, py3: { - enabled: true, embedded_launcher: true, } } @@ -81,6 +69,7 @@ python_test_host { "dependency/vts_vndk_dependency_test.py", ], test_suites: [ + "general-tests", "vts", ], test_config: "dependency/vts_vndk_dependency_test.xml", @@ -97,6 +86,7 @@ python_test_host { "files/vts_vndk_files_test.py", ], test_suites: [ + "general-tests", "vts", ], test_config: "files/vts_vndk_files_test.xml", diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..c18e6f4 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,10 @@ +{ + "presubmit": [ + { + "name": "vts_vndk_dependency_test" + }, + { + "name": "vts_vndk_files_test" + } + ] +} diff --git a/files/vts_vndk_files_test.py b/files/vts_vndk_files_test.py index 017ae9c..faa3e6a 100644 --- a/files/vts_vndk_files_test.py +++ b/files/vts_vndk_files_test.py @@ -64,19 +64,21 @@ class VtsVndkFilesTest(unittest.TestCase): return [] return self._dut.FindFiles(dir_path, "*", "!", "-type", "d") - def _Fail(self, unexpected_paths): + def _Fail(self, unexpected_paths, message): """Logs error and fails current test. Args: unexpected_paths: A list of strings, the paths to be shown in the log message. + message: A string, the error message. """ logging.error("Unexpected files:\n%s", "\n".join(unexpected_paths)) assert_lines = unexpected_paths[:20] if len(unexpected_paths) > 20: - assert_lines.append("...") - assert_lines.append( - "Total number of errors: %d" % len(unexpected_paths)) + assert_lines.extend([ + "...", + "Total number of errors: %d" % len(unexpected_paths)]) + assert_lines.append(message) self.fail("\n".join(assert_lines)) def _TestVndkDirectory(self, vndk_dir, vndk_list_names): @@ -95,7 +97,9 @@ class VtsVndkFilesTest(unittest.TestCase): unexpected = [x for x in self._ListFiles(vndk_dir) if target_path_module.basename(x) not in vndk_set] if unexpected: - self._Fail(unexpected) + self._Fail(unexpected, + "The above libraries are not %s." % + ", ".join(vndk_list_names)) def _TestNotInVndkDirecotory(self, vndk_dir, vndk_list_names, except_libs): """Verifies that VNDK directory doesn't contain specific files. @@ -116,7 +120,9 @@ class VtsVndkFilesTest(unittest.TestCase): unexpected = [x for x in self._ListFiles(vndk_dir) if target_path_module.basename(x) in vndk_set] if unexpected: - self._Fail(unexpected) + self._Fail(unexpected, + "%s must not contain %s libraries." % + (vndk_dir, ", ",join(vndk_list_names))) def _TestVndkCoreDirectory(self, bitness): """Verifies that VNDK directory doesn't contain extra files.""" diff --git a/golden/Android.bp b/golden/Android.bp index 61ea604..232cb0c 100644 --- a/golden/Android.bp +++ b/golden/Android.bp @@ -21,11 +21,7 @@ python_binary_host { main: "extract_lsdump.py", srcs: ["extract_lsdump.py"], version: { - py2: { - enabled: false, - }, py3: { - enabled: true, embedded_launcher: true, }, } |