From ba8bf132209384cd74369d26b6e8b63fe48a7c8c Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Sun, 1 May 2022 10:16:54 +0200
Subject: [PATCH] Test and fix with --experimental_sibling_repository_layout

---
 .../build/lib/remote/merkletree/DirectoryTreeBuilder.java  | 6 +++---
 src/test/shell/bazel/remote/remote_execution_test.sh       | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/remote/merkletree/DirectoryTreeBuilder.java b/src/main/java/com/google/devtools/build/lib/remote/merkletree/DirectoryTreeBuilder.java
index 6e2f3ee10fb118..c3d0223151c1cb 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/merkletree/DirectoryTreeBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/merkletree/DirectoryTreeBuilder.java
@@ -216,9 +216,9 @@ private static <T> int build(
         // Create an empty directory and its parent directories but don't visit the TreeArtifact
         // input itself: A TreeArtifact's metadata has type REGULAR_FILE, not DIRECTORY, and would
         // thus lead to an empty file being created in the buildFromActionInputs visitor.
-        DirectoryNode emptyDir = new DirectoryNode(artifact.getExecPath().getBaseName());
-        tree.put(artifact.getExecPath(), emptyDir);
-        createParentDirectoriesIfNotExist(artifact.getExecPath(), emptyDir, tree);
+        DirectoryNode emptyDir = new DirectoryNode(path.getBaseName());
+        tree.put(path, emptyDir);
+        createParentDirectoriesIfNotExist(path, emptyDir, tree);
         continue;
       }
 
diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh
index d08646c4067e0b..34d5c3bc253e3e 100755
--- a/src/test/shell/bazel/remote/remote_execution_test.sh
+++ b/src/test/shell/bazel/remote/remote_execution_test.sh
@@ -3110,6 +3110,13 @@ EOF
     --remote_executor=grpc://localhost:${worker_port} \
     --experimental_remote_merkle_tree_cache \
     //pkg:a &>$TEST_log || fail "expected build to succeed with Merkle tree cache"
+
+  bazel clean --expunge
+  bazel build \
+    --spawn_strategy=remote \
+    --remote_executor=grpc://localhost:${worker_port} \
+    --experimental_sibling_repository_layout \
+    //pkg:a &>$TEST_log || fail "expected build to succeed with sibling repository layout"
 }
 
 # Runs coverage with `cc_test` and RE then checks the coverage file is returned.