Dissuade utp_test users from passing args/--test_args and think…

…ing it will do anything. PiperOrigin-RevId: 616868870 Change-Id: I1593ae1e0311a3b3449c1e145a742427af9e8439
bazelbuild · Mar 18, 2024 · 26ec6c5 · 26ec6c5
1 parent e24e72a
commit 26ec6c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/launcher/launcher.bzl b/launcher/launcher.bzl
@@ -212,6 +212,8 @@ def _uuid_command(variable_name):
     return "export {}=`cat /proc/sys/kernel/random/uuid`".format(variable_name)
 
 def _utp_test_impl(ctx):
+    if ctx.attr.args:
+        fail("UTP does not process args. UTP must be configured through Starlark rules.")
     extra_setup_commands = []
     message = _utp_build_message(ctx)
     config = ctx.actions.declare_file(ctx.attr.name + "_runner_config.proto")

diff --git a/tools/utp/constants.bzl b/tools/utp/constants.bzl
@@ -16,8 +16,8 @@
 
 visibility(["//test/..."])
 
-JAR_PATH_LOCAL_ANDROID_DEVICE_PROVIDER = "../rules_jvm_external~5.3~maven~maven/com/google/testing/platform/android-device-provider-local/0.0.9-alpha01/processed_android-device-provider-local-0.0.9-alpha01.jar"
-JAR_PATH_ANDROID_INSTRUMENTATION_DRIVER="../rules_jvm_external~5.3~maven~maven/com/google/testing/platform/android-driver-instrumentation/0.0.9-alpha01/processed_android-driver-instrumentation-0.0.9-alpha01.jar"
+JAR_PATH_LOCAL_ANDROID_DEVICE_PROVIDER = "../rules_jvm_external~~maven~maven/com/google/testing/platform/android-device-provider-local/0.0.9-alpha01/processed_android-device-provider-local-0.0.9-alpha01.jar"
+JAR_PATH_ANDROID_INSTRUMENTATION_DRIVER="../rules_jvm_external~~maven~maven/com/google/testing/platform/android-driver-instrumentation/0.0.9-alpha01/processed_android-driver-instrumentation-0.0.9-alpha01.jar"
 
 TARGET_EMPTY_BINARY = "//test/launcher:empty_java_binary_deploy.jar"
 JAR_PATH_EMPTY_BINARY="test/launcher/empty_java_binary_deploy.jar"