diff options
-rw-r--r-- | dependency/VtsVndkDependencyTest.py | 19 | ||||
-rw-r--r-- | dependency/vts_vndk_dependency_test.py | 17 | ||||
-rw-r--r-- | dependency/vts_vndk_dependency_test.xml | 2 | ||||
-rw-r--r-- | golden/vndk_data.py | 4 | ||||
-rw-r--r-- | utils.py | 5 |
5 files changed, 32 insertions, 15 deletions
diff --git a/dependency/VtsVndkDependencyTest.py b/dependency/VtsVndkDependencyTest.py index f99e670..6a385c7 100644 --- a/dependency/VtsVndkDependencyTest.py +++ b/dependency/VtsVndkDependencyTest.py @@ -51,8 +51,12 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): 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. - _SP_HAL_LINK_PATHS: Format strings of same-process HAL's link paths. - _VENDOR_LINK_PATHS: Format strings of vendor processes' link paths. + _SP_HAL_LINK_PATHS: Format strings of same-process HAL's default link + paths. + _VENDOR_LINK_PATHS: Format strings of vendor processes' default link + paths. + _VENDOR_PERMITTED_PATHS: Same-process HAL and vendor processes' + permitted link paths. """ _TARGET_DIR_SEP = "/" _TARGET_ROOT_DIR = "/" @@ -67,6 +71,9 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): "/odm/{LIB}/hw", "/odm/{LIB}/egl", "/odm/{LIB}", "/vendor/{LIB}/hw", "/vendor/{LIB}/egl", "/vendor/{LIB}" ] + _VENDOR_PERMITTED_PATHS = [ + "/odm", "/vendor" + ] _DEFAULT_PROGRAM_INTERPRETERS = [ "/system/bin/linker", "/system/bin/linker64" ] @@ -345,8 +352,8 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): vendor_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for x in self._VENDOR_LINK_PATHS] - vendor_namespace = self._FindLibsInLinkPaths(bitness, - vendor_link_paths, objs) + vendor_namespace = self._FindLibsInLinkPaths( + bitness, self._VENDOR_PERMITTED_PATHS, objs) # Exclude VNDK and VNDK-SP extensions from vendor libraries. for vndk_ext_dir in (vndk_utils.GetVndkExtDirectories(bitness) + vndk_utils.GetVndkSpExtDirectories(bitness)): @@ -357,8 +364,8 @@ class VtsVndkDependencyTest(base_test.BaseTestClass): sp_hal_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for x in self._SP_HAL_LINK_PATHS] - sp_hal_namespace = self._FindLibsInLinkPaths(bitness, - sp_hal_link_paths, objs) + sp_hal_namespace = self._FindLibsInLinkPaths( + bitness, self._VENDOR_PERMITTED_PATHS, objs) # Find same-process HAL and dependencies sp_hal_libs = set() diff --git a/dependency/vts_vndk_dependency_test.py b/dependency/vts_vndk_dependency_test.py index 228a373..e20afc5 100644 --- a/dependency/vts_vndk_dependency_test.py +++ b/dependency/vts_vndk_dependency_test.py @@ -46,8 +46,12 @@ class VtsVndkDependencyTest(unittest.TestCase): 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. - _SP_HAL_LINK_PATHS: Format strings of same-process HAL's link paths. - _VENDOR_LINK_PATHS: Format strings of vendor processes' link paths. + _SP_HAL_LINK_PATHS: Format strings of same-process HAL's default link + paths. + _VENDOR_LINK_PATHS: Format strings of vendor processes' default link + paths. + _VENDOR_PERMITTED_PATHS: Same-process HAL and vendor processes' + permitted link paths. _VENDOR_APP_DIRS: The app directories in vendor partitions. """ _TARGET_DIR_SEP = "/" @@ -63,6 +67,9 @@ class VtsVndkDependencyTest(unittest.TestCase): "/odm/{LIB}/hw", "/odm/{LIB}/egl", "/odm/{LIB}", "/vendor/{LIB}/hw", "/vendor/{LIB}/egl", "/vendor/{LIB}" ] + _VENDOR_PERMITTED_PATHS = [ + "/odm", "/vendor" + ] _VENDOR_APP_DIRS = [ "/vendor/app", "/vendor/priv-app", "/odm/app", "/odm/priv-app" ] @@ -366,7 +373,7 @@ class VtsVndkDependencyTest(unittest.TestCase): vendor_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for x in self._VENDOR_LINK_PATHS] vendor_namespace = self._FindLibsInLinkPaths( - bitness, vendor_link_paths + self._VENDOR_APP_DIRS, objs) + bitness, self._VENDOR_PERMITTED_PATHS, objs) # Exclude VNDK and VNDK-SP extensions from vendor libraries. for vndk_ext_dir in (vndk_utils.GetVndkExtDirectories(bitness) + vndk_utils.GetVndkSpExtDirectories(bitness)): @@ -377,8 +384,8 @@ class VtsVndkDependencyTest(unittest.TestCase): sp_hal_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for x in self._SP_HAL_LINK_PATHS] - sp_hal_namespace = self._FindLibsInLinkPaths(bitness, - sp_hal_link_paths, objs) + sp_hal_namespace = self._FindLibsInLinkPaths( + bitness, self._VENDOR_PERMITTED_PATHS, objs) # Find same-process HAL and dependencies sp_hal_libs = set() diff --git a/dependency/vts_vndk_dependency_test.xml b/dependency/vts_vndk_dependency_test.xml index f0f37c7..0a15678 100644 --- a/dependency/vts_vndk_dependency_test.xml +++ b/dependency/vts_vndk_dependency_test.xml @@ -17,7 +17,7 @@ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> <test class="com.android.tradefed.testtype.python.PythonBinaryHostTest"> <option name="par-file-name" value="vts_vndk_dependency_test" /> - <option name="test-timeout" value="6m" /> + <option name="test-timeout" value="10m" /> </test> </configuration> diff --git a/golden/vndk_data.py b/golden/vndk_data.py index 5e971aa..56ed5d4 100644 --- a/golden/vndk_data.py +++ b/golden/vndk_data.py @@ -52,8 +52,8 @@ _ABI_LIST = ( ("arm64", 64, "arm64_armv8-a"), ("arm64", 32, "arm_armv8-a"), ("arm", 32, "arm_armv7-a-neon"), - ("x86_64", 64, "x86_x86_64"), - ("x86_64", 32, "x86_64"), + ("x86_64", 64, "x86_64"), + ("x86_64", 32, "x86_x86_64"), ("x86", 32, "x86"), ) @@ -32,7 +32,10 @@ class AndroidDevice(object): def AdbPull(self, src, dst): cmd = ["adb", "-s", self._serial_number, "pull", src, dst] - subprocess.check_call(cmd, shell=False, stdin=subprocess.PIPE, + env = os.environ.copy() + if "ADB_COMPRESSION" not in env: + env["ADB_COMPRESSION"] = "0" + subprocess.check_call(cmd, shell=False, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) def Execute(self, *args): |