Make sure we always use an absolute path for ${RUNFILES}

Related to: bazelbuild#148
mattmoor · Sep 18, 2017 · 1cc2028 · 1cc2028
1 parent 7fc2bd0
commit 1cc2028
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/docker/incremental_load.sh.tpl b/docker/incremental_load.sh.tpl
@@ -18,7 +18,7 @@ set -eu
 
 # This is a generated file that loads all docker layers built by "docker_build".
 
-RUNFILES="${PYTHON_RUNFILES:-${BASH_SOURCE[0]}.runfiles}"
+RUNFILES="${PYTHON_RUNFILES:-${PWD}/${BASH_SOURCE[0]}.runfiles}"
 
 DOCKER="${DOCKER:-docker}"
 

diff --git a/testing/e2e.sh b/testing/e2e.sh
@@ -96,6 +96,17 @@ function clear_docker() {
   docker rmi -f $(docker images -aq) || true
 }
 
+function test_bazel_build_then_run_docker_build_clean() {
+  cd "${ROOT}"
+  for target in $(bazel query 'kind("docker_build", "docker/testdata/...")');
+  do
+    clear_docker
+    bazel build $target
+    # Replace : with /
+    ./bazel-bin/${target/://}
+  done
+}
+
 function test_bazel_run_docker_build_clean() {
   cd "${ROOT}"
   for target in $(bazel query 'kind("docker_build", "docker/testdata/...")');
@@ -200,6 +211,7 @@ function test_war_image() {
 }
 
 test_top_level
+test_bazel_build_then_run_docker_build_clean
 test_bazel_run_docker_build_clean
 test_bazel_run_docker_bundle_clean
 test_bazel_run_docker_import_clean