diff options
| author | Adin Scannell <ascannell@google.com> | 2020-01-27 10:04:07 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-27 12:21:00 -0800 |
| commit | d29e59af9fbd420e34378bcbf7ae543134070217 (patch) | |
| tree | aff60c95c843048d194a8317d200f2f2c2d210df /tools/images | |
| parent | 6b43cf791a74a746443f70f98d859c1246f87e2a (diff) | |
Standardize on tools directory.
PiperOrigin-RevId: 291745021
Diffstat (limited to 'tools/images')
| -rw-r--r-- | tools/images/BUILD | 2 | ||||
| -rw-r--r-- | tools/images/defs.bzl | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/images/BUILD b/tools/images/BUILD index 2b77c2737..f1699b184 100644 --- a/tools/images/BUILD +++ b/tools/images/BUILD @@ -1,4 +1,4 @@ -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//tools:defs.bzl", "cc_binary") load("//tools/images:defs.bzl", "vm_image", "vm_test") package( 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", |