From 307cccac681b3f550ee982f44e9948913b07d6ab Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 12 Sep 2022 12:55:37 -0700 Subject: Remove py2 usages Bug: 203436762 Test: m nothing Change-Id: I0700ef1c5819c1a2f9aec6a0c64ea39cdb35b461 --- Android.bp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Android.bp b/Android.bp index e8fb2cc..6b1fadd 100644 --- a/Android.bp +++ b/Android.bp @@ -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, } } -- cgit v1.2.3 From fb38620b8907dc6ca63bb3989a723518080723c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sat, 17 Sep 2022 11:38:41 +0000 Subject: Remove Python enables identical to global defaults. Bug: 245854393 Test: presubmit Change-Id: I4d35e977e0df7013ad3df06330f2fd74239c9b7a --- golden/Android.bp | 4 ---- 1 file changed, 4 deletions(-) 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, }, } -- cgit v1.2.3 From 261e9a65c493029f58e54be4a3106ff5552a9539 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 23 Mar 2023 17:39:54 +0000 Subject: TEST_MAPPING += vndk dependency and files test Bug: 274790216 Test: atest . Change-Id: I47b9c1c945db8428ac3da5aafb3332bd196071f0 --- Android.bp | 2 ++ TEST_MAPPING | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 TEST_MAPPING diff --git a/Android.bp b/Android.bp index 6b1fadd..d7b26f9 100644 --- a/Android.bp +++ b/Android.bp @@ -69,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", @@ -85,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" + } + ] +} -- cgit v1.2.3 From 11f174d251897ef8f2e09dee558052adbf1b1df8 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Fri, 24 Mar 2023 14:29:52 +0800 Subject: Let vts_vndk_files_test show detailed error message Test: atest vts_vndk_files_test Bug: 274928932 Change-Id: Ic45fff6a40ab42da3be56f2bdfe9f5fccc325212 --- files/vts_vndk_files_test.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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.""" -- cgit v1.2.3