From 80fa1fec77762b8e1529eab90da678ee93705fda Mon Sep 17 00:00:00 2001 From: JiaYan Lin Date: Thu, 25 Jan 2024 02:48:52 +0000 Subject: [PATCH] update r8 test --- .../android_binary_internal/r8_integration/BUILD | 3 ++- .../r8_integration/r8_integration_test.py | 15 +++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/test/rules/android_binary_internal/r8_integration/BUILD b/test/rules/android_binary_internal/r8_integration/BUILD index 997b6c41..e1a7c4f9 100644 --- a/test/rules/android_binary_internal/r8_integration/BUILD +++ b/test/rules/android_binary_internal/r8_integration/BUILD @@ -3,10 +3,11 @@ load("@rules_python//python:py_test.bzl", "py_test") py_test( name = "r8_integration_test", srcs = ["r8_integration_test.py"], + args = ["$(location @androidsdk//:dexdump)"], data = [ "//test/rules/android_binary_internal/r8_integration/java/com/basicapp:basic_app_R8_no_shrink", "//test/rules/android_binary_internal/r8_integration/java/com/basicapp:basic_app_R8_shrink", "//test/rules/android_binary_internal/r8_integration/java/com/basicapp:basic_app_no_R8", - "@androidsdk//:files", + "@androidsdk//:dexdump", ], ) diff --git a/test/rules/android_binary_internal/r8_integration/r8_integration_test.py b/test/rules/android_binary_internal/r8_integration/r8_integration_test.py index 21ff4c51..c764f78c 100755 --- a/test/rules/android_binary_internal/r8_integration/r8_integration_test.py +++ b/test/rules/android_binary_internal/r8_integration/r8_integration_test.py @@ -16,6 +16,7 @@ import subprocess import unittest import zipfile +import sys @@ -39,17 +40,6 @@ def _r8_integration_check( expect_unused_activity_resource, "res/layout/unused_activity.xml" in apk_files, ) - RUNFILES_DIR = os.environ["RUNFILES_DIR"] - build_tools_dir = RUNFILES_DIR + "/androidsdk/build-tools/" - print("############# Content of ", build_tools_dir, "\t", os.scandir(build_tools_dir)) - print(">>>>>>>>>>>>> ", [f for f in os.scandir(build_tools_dir)]) - print(">>>>>>>>>>>>> ", [f for f in os.scandir(build_tools_dir) if f.is_dir()]) - tok = "TEST_SRCDIR" - print("------------- ", os.environ[tok], os.scandir(os.environ[tok])) - print("------------- ", [ f for f in os.scandir(os.environ[tok]) ] ) - print(">>>>>>>>>>>>> ", [ f for f in os.scandir( os.environ[tok] + "/androidsdk/build-tools" )]) - dexdump = '$(PYTHON_RUNFILES)/androidsdk/dexdump' - dexdump_proc = subprocess.run( [dexdump, classes_dex], stdout=subprocess.PIPE, @@ -95,4 +85,5 @@ def test_r8_integration(self): if __name__ == "__main__": - unittest.main() + dexdump = sys.argv.pop() + unittest.main(argv=None)