diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-08-03 10:10:19 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-08-04 09:07:24 +0000 |
| commit | 6de0bb35329e8b2f196ae9391d6eca1f9f9de5a7 (patch) | |
| tree | 332cd3e5ca439ceebaac19785732e94370c080d1 /tools/build_defs/docker/testdata | |
| parent | 6082c78c9436045863dc999011050e44ab9afe7e (diff) | |
Fix docker_build file path when file is generated
If the file is generated, by a genrule for instance, then
the stripping of the prefix was incorrect because the used path
was containing 'bazel-out/...' prefix. This change moved the prefix
stripping to the Skylark rule so we can use "short_path".
Also fix the test paths.
Tested by bazel test //tools/build_defs/docker:build_test.
--
Change-Id: Ia3eb98268505002bade1f6b0dd916e1a9767a530
Reviewed-on: https://bazel-review.googlesource.com/1770
MOS_MIGRATED_REVID=99710676
Diffstat (limited to 'tools/build_defs/docker/testdata')
| -rw-r--r-- | tools/build_defs/docker/testdata/BUILD | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tools/build_defs/docker/testdata/BUILD b/tools/build_defs/docker/testdata/BUILD index a8d5e6faa4..e365847cff 100644 --- a/tools/build_defs/docker/testdata/BUILD +++ b/tools/build_defs/docker/testdata/BUILD @@ -1,10 +1,21 @@ package( default_visibility = [ - "//tools/build_rules/docker:__subpackages__", + "//tools/build_defs/docker:__subpackages__", ], ) -load("/tools/build_rules/docker/docker", "docker_build") +load("/tools/build_defs/docker/docker", "docker_build") + +genrule( + name = "gen", + outs = ["gen.out"], + cmd = "echo generated > $@", +) + +docker_build( + name = "gen_image", + files = [":gen"], +) docker_build( name = "files_base", @@ -89,7 +100,7 @@ docker_build( py_binary( name = "extras_gen", srcs = ["extras_gen.py"], - deps = ["//tools/build_rules/docker:archive"], + deps = ["//tools/build_defs/docker:archive"], ) genrule( @@ -135,7 +146,7 @@ docker_build( py_binary( name = "strip_top", srcs = ["strip_top.py"], - deps = ["//third_party/bazel/tools/build_defs/docker:archive"], + deps = ["//tools/build_defs/docker:archive"], ) [genrule( |