From 6de0bb35329e8b2f196ae9391d6eca1f9f9de5a7 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Mon, 3 Aug 2015 10:10:19 +0000 Subject: 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 --- tools/build_defs/docker/testdata/BUILD | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'tools/build_defs/docker/testdata') 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( -- cgit v1.2.3