From f535899959b27da51779a6142699d7104681b9bc Mon Sep 17 00:00:00 2001 From: Karl Shaffer Date: Mon, 10 May 2021 13:17:03 -0400 Subject: Minor bugfixes to address changes by ATest team - Updates the .bzl rules and Tradefed BUILD template so that the atest-tradefed.jar and atest_script_help.sh is included (as it includes the config XML necessary for ATest runs). - Fixes issue where static files synced to source tree are not cleaned up properly. Test: Manual, through running the script and associated test targets. Change-Id: Icf1b8a2b1175a1510c75127f087544212f52cfe0 --- experiments/prepare_bazel_test_env/bazelenv.py | 2 +- .../build/bazel/rules/android_test.bzl.template | 2 +- .../templates/build/bazel/rules/cc_test.bzl.template | 2 +- .../templates/build/bazel/rules/java_test.bzl.template | 2 +- .../tools/tradefederation/core/BUILD.bazel.template | 17 +++++++++++++---- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/experiments/prepare_bazel_test_env/bazelenv.py b/experiments/prepare_bazel_test_env/bazelenv.py index e42e767..c64242c 100644 --- a/experiments/prepare_bazel_test_env/bazelenv.py +++ b/experiments/prepare_bazel_test_env/bazelenv.py @@ -153,7 +153,7 @@ class StaticResource(Resource): super().sync() def clean(self): - super().sync() + super().clean() def __repr__(self): return (f"StaticResource(stage_path={self.stage_path}, " diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template index 458f886..bc529d4 100644 --- a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template +++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template @@ -84,7 +84,7 @@ android_test = rule( ), "_tradefed_script_help": attr.label( - default=Label("//tools/tradefederation/core:script_help"), ), + default=Label("//tools/tradefederation/core:atest_script_help"), ), "_tradefed_jars": attr.label( default=Label("//tools/tradefederation/core:tradefed_lib"), ), diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template index c6f5c46..a62aa8f 100644 --- a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template +++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template @@ -65,7 +65,7 @@ cc_test = rule( allow_single_file = True, ), "_tradefed_script_help": attr.label( - default = Label("//tools/tradefederation/core:script_help"), + default = Label("//tools/tradefederation/core:atest_script_help"), ), "_tradefed_jars": attr.label( default = Label("//tools/tradefederation/core:tradefed_lib"), diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template index dbfb2e3..0f0f386 100644 --- a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template +++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template @@ -74,7 +74,7 @@ java_test = rule( ), "_tradefed_script_help": attr.label( - default=Label("//tools/tradefederation/core:script_help"), ), + default=Label("//tools/tradefederation/core:atest_script_help"), ), "_tradefed_jars": attr.label( default=Label("//tools/tradefederation/core:tradefed_lib"), ), diff --git a/experiments/prepare_bazel_test_env/data/templates/tools/tradefederation/core/BUILD.bazel.template b/experiments/prepare_bazel_test_env/data/templates/tools/tradefederation/core/BUILD.bazel.template index 3493ba6..2158fd4 100644 --- a/experiments/prepare_bazel_test_env/data/templates/tools/tradefederation/core/BUILD.bazel.template +++ b/experiments/prepare_bazel_test_env/data/templates/tools/tradefederation/core/BUILD.bazel.template @@ -21,13 +21,15 @@ package(default_visibility=["//visibility:public"]) _TF_JARS = glob(["{prebuilts_dir_name}/host/tradefed/*.jar"]) +_ATEST_TF_JAR_SRC = ["{prebuilts_dir_name}/host/framework/atest-tradefed.jar"] +_ATEST_TF_JAR_DEST = ["atest-tradefed.jar"] _TF_JARNAMES = [ f.replace("{prebuilts_dir_name}/host/tradefed/", "") for f in _TF_JARS ] genrule(name="tradefed_lib_soong_import", - srcs=_TF_JARS, - outs=_TF_JARNAMES, + srcs=_TF_JARS + _ATEST_TF_JAR_SRC, + outs=_TF_JARNAMES + _ATEST_TF_JAR_DEST, cmd="cp -t $(RULEDIR) $(SRCS)") java_import(name="tradefed_lib", jars=[":tradefed_lib_soong_import"]) @@ -39,6 +41,13 @@ genrule(name="script_help", outs=["script_help.sh"], cmd="cp -t $(RULEDIR) $<") +genrule(name="atest_script_help", + srcs=[ + "{prebuilts_dir_name}/host/bin/atest_script_help.sh" + ], + outs=["atest_script_help.sh"], + cmd="cp -t $(RULEDIR) $<") + genrule( name="tradefed", srcs=[ @@ -55,8 +64,8 @@ genrule( genrule( name="atest_tradefed", srcs=[ - ":script_help", ":tradefed_lib", - "{prebuilts_dir_name}/host/bin/atest_tradefed.sh" + ":tradefed_lib", ":atest_script_help", + "{prebuilts_dir_name}/host/bin/atest_tradefed.sh", ], outs=["atest_tradefed.sh"], cmd= -- cgit v1.2.3