summaryrefslogtreecommitdiffhomepage
path: root/tools/images/defs.bzl
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2020-01-29 13:21:12 -0800
committerKevin Krakauer <krakauer@google.com>2020-01-29 13:21:12 -0800
commitb615f94aeacb2c21bb59c8b44f303e7b7ca05ad6 (patch)
tree79907e842eeba2a1f01acb5b5661800dc6ef2174 /tools/images/defs.bzl
parentd6a2e01d3e57e0837c7e5cfda3b56c4dcfbb4627 (diff)
parent148fda60e8dee29f2df85e3104e3d5de1a225bcf (diff)
Merge branch 'master' into ipt-udp-matchers
Diffstat (limited to 'tools/images/defs.bzl')
-rw-r--r--tools/images/defs.bzl6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/images/defs.bzl b/tools/images/defs.bzl
index d8e422a5d..32235813a 100644
--- a/tools/images/defs.bzl
+++ b/tools/images/defs.bzl
@@ -28,6 +28,8 @@ The vm_test rule can be used to execute a command remotely. For example,
)
"""
+load("//tools:defs.bzl", "default_installer")
+
def _vm_image_impl(ctx):
script_paths = []
for script in ctx.files.scripts:
@@ -165,8 +167,8 @@ def vm_test(
targets = kwargs.pop("targets", [])
if installer:
targets = [installer] + targets
- targets = [
- ] + targets
+ if default_installer():
+ targets = [default_installer()] + targets
_vm_test(
tags = [
"local",