From 24cc2e9fbd536ebc87ee56a2fa01096368e143ce Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Mon, 2 Jun 2025 11:11:39 +0200 Subject: just-mr: Warn for non-content-fixed repo reached from absent main If the main repository is marked absent, warn if during the dependency closure computation any non-content-fixed repositories are reached, i.e., any "file"-type repositories that are neither implicitly nor explicitly marked "to_git". Also warn if the main repository itself is marked absent but is not content fixed. Add small test checking that the new warning is produced. --- test/end-to-end/just-mr/TARGETS | 7 +++ test/end-to-end/just-mr/absent-closure.sh | 99 +++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 test/end-to-end/just-mr/absent-closure.sh (limited to 'test') diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS index a4c0b402..426b2889 100644 --- a/test/end-to-end/just-mr/TARGETS +++ b/test/end-to-end/just-mr/TARGETS @@ -110,6 +110,12 @@ , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "repos": ["fetch-absent (data)"] } +, "absent-closure": + { "type": ["@", "rules", "shell/test", "script"] + , "name": ["absent-closure"] + , "test": ["absent-closure.sh"] + , "deps": [["", "mr-tool-under-test"]] + } , "absent-config": { "type": ["end-to-end", "with serve"] , "name": ["absent-config"] @@ -288,6 +294,7 @@ } , [ "fetch-absent" , "fetch-absent-git-tree" + , "absent-closure" , "absent-config" , "fetch-absent-archives" , "fetch-absent-archives-symlinks" diff --git a/test/end-to-end/just-mr/absent-closure.sh b/test/end-to-end/just-mr/absent-closure.sh new file mode 100644 index 00000000..c4b745cc --- /dev/null +++ b/test/end-to-end/just-mr/absent-closure.sh @@ -0,0 +1,99 @@ +#!/bin/sh +# Copyright 2025 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. + +### +# Test that users are warned if a non-absent repository is reached from an +# absent main repository. +## + +set -eu + +readonly JUST_MR="${PWD}/bin/mr-tool-under-test" +readonly FILE_ROOT="${TEST_TMPDIR}/file-repos" +readonly TEST_ROOT="${TEST_TMPDIR}/test-root" +readonly LBR="${TEST_TMPDIR}/local-build-root" +readonly OUT="${TEST_TMPDIR}/out" +mkdir -p "${OUT}" + +# Set up file repos +mkdir -p "${FILE_ROOT}/test_dir1" +echo test > "${FILE_ROOT}/test_dir1/test_file" +mkdir -p "${FILE_ROOT}/test_dir2/inner_dir" +echo test > "${FILE_ROOT}/test_dir2/inner_dir/test_file" +mkdir -p "${FILE_ROOT}/test_dir3/inner_dir" +echo test > "${FILE_ROOT}/test_dir3/inner_dir/test_file" + +# Setup sample repository config +mkdir -p "${TEST_ROOT}" +cd "${TEST_ROOT}" +touch ROOT +cat > repos.json <&1 + +echo +echo Check expected warnings +echo + +grep 'WARN.* "main" .*absent.* "main"' "${OUT}/log.txt" +grep 'WARN.* "file_repo_not_content_fixed" .*absent.* "main"' "${OUT}/log.txt" +grep 'WARN.* "file_repo_to_git_explicit" .*absent.* "main"' "${OUT}/log.txt" && + echo "should have failed" && exit 1 || : +grep 'WARN.* "file_repo_to_git_implicit" .*absent.* "main"' "${OUT}/log.txt" && + echo "should have failed" && exit 1 || : + +echo +echo OK -- cgit v1.2.3