Add test verifying the main use cases of add-to-cas

2 files changed, 175 insertions, 8 deletions

diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS
index 4d88210a..9d3709a6 100644
--- a/test/end-to-end/remote-execution/TARGETS
+++ b/test/end-to-end/remote-execution/TARGETS
@@ -58,17 +58,40 @@
     , "value": {"type": "var", "name": "TIMEOUT_SCALE", "default": 10}
     }
   }
+, "add-to-cas":
+  { "type": ["end-to-end", "with remote"]
+  , "name": ["add-to-cas"]
+  , "test": ["add-to-cas.sh"]
+  , "deps":
+    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  }
 , "TESTS":
   { "type": "install"
   , "tainted": ["test"]
+  , "arguments_config": ["TEST_COMPATIBLE_REMOTE", "TEST_BOOTSTRAP_JUST_MR"]
   , "deps":
-    [ "native-protocol"
-    , "large-blobs"
-    , "upload-test"
-    , "install"
-    , "install-cas"
-    , "dispatch"
-    , "split-splice"
-    ]
+    { "type": "++"
+    , "$1":
+      [ [ "native-protocol"
+        , "large-blobs"
+        , "upload-test"
+        , "install"
+        , "install-cas"
+        , "dispatch"
+        , "split-splice"
+        ]
+      , { "type": "if"
+        , "cond":
+          { "type": "or"
+          , "$1":
+            [ {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
+            , {"type": "var", "name": "TEST_COMPATIBLE_REMOTE"}
+            ]
+          }
+        , "then": []
+        , "else": ["add-to-cas"]
+        }
+      ]
+    }
   }
 }
diff --git a/test/end-to-end/remote-execution/add-to-cas.sh b/test/end-to-end/remote-execution/add-to-cas.sh
new file mode 100755
index 00000000..51cd14b1
--- /dev/null
+++ b/test/end-to-end/remote-execution/add-to-cas.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+# Copyright 2024 Huawei Cloud Computing Technology Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -eu
+
+readonly ROOT="${PWD}"
+readonly JUST="${PWD}/bin/tool-under-test"
+readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
+readonly CLIENT_A="${TEST_TMPDIR}/local-build-root-A"
+readonly CLIENT_B="${TEST_TMPDIR}/local-build-root-B"
+readonly CLIENT_SYMLINK_CHECK="${TEST_TMPDIR}/local-build-root-symlink-check"
+readonly TOOLS_DIR="${TEST_TMPDIR}/tools"
+readonly OUT_A="${TEST_TMPDIR}/out/client-A"
+readonly OUT_B="${TEST_TMPDIR}/out/client-B"
+readonly ARCHIVES_DIR="${TEST_TMPDIR}/archives"
+readonly LINK_DIR="${TEST_TMPDIR}/add-symlinks-here"
+
+
+REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
+
+# "checkout" of a repository
+WORK="${ROOT}/work"
+mkdir work
+cat > work/TARGETS <<'EOF'
+{ "":
+  { "type": "generic"
+  , "cmds":
+    ["echo -n 'Hello ' > out.txt", "cat name >> out.txt", "echo '!' >> out.txt"]
+  , "outs": ["out.txt"]
+  , "deps": ["name"]
+  }
+}
+EOF
+echo -n World > work/name
+
+# There is also an archive with the sources
+mkdir -p "${ARCHIVES_DIR}"
+tar cvf "${ARCHIVES_DIR}/src.tar" work
+echo
+
+# Mock vcs tool that should not be called
+mkdir -p "${TOOLS_DIR}"
+VCS="${TOOLS_DIR}/mock-vcs"
+cat > "${VCS}" <<'EOF'
+#!/bin/sh
+echo "It should not be necessary to call the foreign VCS"
+exit 1
+EOF
+chmod 755 "${VCS}"
+
+# Preliminaries: verifying link hashing and --follow-symlinks
+
+mkdir -p "${LINK_DIR}"
+ln -s "${WORK}" "${LINK_DIR}/dir"
+
+dir_link_hash=$("${JUST}" add-to-cas --local-build-root "${CLIENT_SYMLINK_CHECK}" "${LINK_DIR}/dir")
+dir_link="$("${JUST}" install-cas --local-build-root "${CLIENT_SYMLINK_CHECK}" "$dir_link_hash")"
+[ "$dir_link" = "${WORK}" ]
+
+dir_follow=$("${JUST}" add-to-cas --local-build-root "${CLIENT_SYMLINK_CHECK}" --follow-symlinks "${LINK_DIR}/dir")
+dir_hash=$("${JUST}" add-to-cas --local-build-root "${CLIENT_SYMLINK_CHECK}" --follow-symlinks "${WORK}")
+
+[ "$dir_follow" = "$dir_hash" ]
+
+
+# Use case: "git tree" repositories and avoiding an additional
+#           call to the foreign version-control system
+cd ${ROOT}
+tree=$("${JUST}" add-to-cas --local-build-root "${CLIENT_A}" work)
+rm -rf work
+
+mkdir "${ROOT}/build-A"
+cd "${ROOT}/build-A"
+touch ROOT
+cat > repos.json <<EOF
+{ "repositories":
+  { "":
+    { "repository":
+      { "type": "git tree"
+      , "id": "$tree"
+      , "cmd": ["${VCS}", "checkout", "r1234"]
+      }
+    }
+  }
+}
+EOF
+cat repos.json
+echo
+
+"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${CLIENT_A}" \
+             -L '["env", "PATH='"${PATH}"'"]' \
+             install -o "${OUT_A}" 2>&1
+
+echo
+grep World "${OUT_A}/out.txt"
+echo
+
+# Use case: Backing up a distfile to the remote-execution service
+cd "${ROOT}"
+archive=$("${JUST}" add-to-cas --local-build-root "${CLIENT_A}" \
+                    ${REMOTE_EXECUTION_ARGS} "${ARCHIVES_DIR}/src.tar")
+rm -f "${ARCHIVES_DIR}/src.tar"
+
+mkdir -p "${ROOT}/build-B"
+cd "${ROOT}/build-B"
+touch ROOT
+cat > repos.json <<EOF
+{ "repositories":
+  { "":
+    { "repository":
+      { "type": "archive"
+      , "content": "$archive"
+      , "subdir": "work"
+      , "fetch": "http://example.org/src.tar"
+      }
+    }
+  }
+}
+EOF
+cat repos.json
+echo
+
+"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${CLIENT_B}" \
+             ${REMOTE_EXECUTION_ARGS} \
+             install -o "${OUT_B}" 2>&1
+
+echo
+grep World "${OUT_B}/out.txt"
+echo
+
+echo OK