Skip to content

fix(scripts): keep a caller's CHECK_DATA_ROOT out of check-affected's test suites #10605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyle-sexton merged 3 commits into from
Oct 28, 2026
Merged

fix(scripts): keep a caller's CHECK_DATA_ROOT out of check-affected's test suites #10605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
096d49a
fix(scripts): keep a caller's CHECK_DATA_ROOT out of check-affected's…
kyle-sexton Oct 28, 2026
8f3ace6
Merge remote-tracking branch 'origin/main' into fix/check-affected-ke…
kyle-sexton Oct 28, 2026
2c3777e
Merge main into fix/check-affected-keep-data-root
melodic-automation-lanes[bot] Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/check-affected.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,10 @@ if [[ "$(pwd -P)" != "$tools" ]]; then
export CHECK_DATA_ROOT="$PWD"
# uvx would otherwise read a uv.toml or [tool.uv] index from the checked tree.
export UV_NO_CONFIG=1
else
# It names this tree, so it says nothing; the test suites build fixture
# repositories, and an inherited one would point them back here.
unset CHECK_DATA_ROOT
fi

gates_file="$tools/scripts/check-affected-gates.txt"
Expand Down
10 changes: 10 additions & 0 deletions scripts/check-affected.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ done
cat >"$repo/scripts/affected-tests.sh" <<'STUB'
#!/usr/bin/env bash
echo "affected-tests ran" >&2
[[ -z "${STUB_ENV_LOG:-}" ]] || printf '%s' "${CHECK_DATA_ROOT-unset}" >"$STUB_ENV_LOG"
[[ -v CHECK_DATA_ROOT ]] && { echo "affected-tests saw CHECK_DATA_ROOT" >&2; exit 1; }
while (($#)); do
[[ "$1" == --write-not-run ]] && printf '%s' "${STUB_NOT_RUN:-}" >"$2"
Expand Down Expand Up @@ -125,6 +126,15 @@ run_from() {
run_from "$other" --base base --tests
check "run from another checkout, it lists the script's own branch's change" \
'[[ $RC == 0 && $OUT == *"over 1 changed files"* && $ERR != *"SKIP tests"* ]]'
# The ready step names the script's own tree in CHECK_DATA_ROOT from another
# checkout. The suites build fixture repositories of their own, so the variable
# must not reach them, or each one reads this tree in place of its fixture.
RC=0
OUT="$(cd "$other" && CHECK_DATA_ROOT="$repo" STUB_ENV_LOG="$tmp/env.log" \
bash "$repo/scripts/check-affected.sh" --base base --tests 2>"$tmp/err")" || RC=$?
ERR="$(cat "$tmp/err")"
check "CHECK_DATA_ROOT naming the script's own tree checks that tree and is not passed to the suites" \
'[[ $RC == 0 && $OUT == *"over 1 changed files"* && $(cat "$tmp/env.log") == unset ]]'
git_test_config "$repo" update-ref refs/remotes/origin/main "$(git_test_config "$repo" rev-parse base)"
run_from "$other" --base origin/main --no-fetch
check "an explicit --base run from another checkout still lists the change" \
Expand Down
Loading