Merge pull request #10691 from hzeller/feature-20260619-fix-git-dep

Fix non-hermeticity of formatting/lint tests.

Author: maliberty

BUILD.bazel

@@ -548,10 +548,14 @@ build_test(
 sh_test(
     name = "lint_tcl_test",
     srcs = ["//bazel:tcl_lint_test.sh"],
-    args = ["$(rootpath //bazel:tclint)"],
+    args = [
+        "$(rootpath //bazel:tclint)",
+        "$(rootpath @git)",
+    ],
     data = [
         "tclint.toml",
         "//bazel:tclint",
+        "@git",
     ],
     tags = ["local"],
 )
@@ -562,10 +566,14 @@ sh_test(
 sh_test(
     name = "fmt_tcl_test",
     srcs = ["//bazel:tcl_fmt_test.sh"],
-    args = ["$(rootpath //bazel:tclfmt)"],
+    args = [
+        "$(rootpath //bazel:tclfmt)",
+        "$(rootpath @git)",
+    ],
     data = [
         "tclint.toml",
         "//bazel:tclfmt",
+        "@git",
     ],
     tags = ["local"],
 )
@@ -589,10 +597,14 @@ sh_binary(
 sh_test(
     name = "lint_bzl_test",
     srcs = ["//bazel:bzl_lint_test.sh"],
-    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    args = [
+        "$(rootpath @buildifier_prebuilt//:buildifier)",
+        "$(rootpath @git)",
+    ],
     data = [
         "MODULE.bazel",
         "@buildifier_prebuilt//:buildifier",
+        "@git",
     ],
     tags = ["local"],
 )
@@ -603,10 +615,14 @@ sh_test(
 sh_test(
     name = "fmt_bzl_test",
     srcs = ["//bazel:bzl_fmt_test.sh"],
-    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    args = [
+        "$(rootpath @buildifier_prebuilt//:buildifier)",
+        "$(rootpath @git)",
+    ],
     data = [
         "MODULE.bazel",
         "@buildifier_prebuilt//:buildifier",
+        "@git",
     ],
     tags = ["local"],
 )

MODULE.bazel

@@ -76,6 +76,7 @@ bazel_dep(name = "boost.utility", version = BOOST_VERSION)
 bazel_dep(name = "cudd", version = "3.0.0.bcr.2")
 bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
 bazel_dep(name = "fmt", version = "11.2.0.bcr.1")
+bazel_dep(name = "git", version = "2.54.0")
 bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
 bazel_dep(name = "openmp", version = "21.1.5.bcr.1")
 bazel_dep(name = "or-tools", version = "9.15")

MODULE.bazel.lock

@@ -3,21 +3,26 @@
 # Copyright (c) 2025-2026, The OpenROAD Authors
 #
 # Check that all Bazel files are properly formatted (no lint warnings).
+
 set -euo pipefail
-TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+
+TOOL="$(realpath "$1")"
+GIT="$(realpath "$2")"
+
 # MODULE.bazel must be in the sh_test `data` deps so it appears as a
 # runfiles symlink pointing at the real workspace. `readlink` (no -f,
 # for macOS portability) resolves the absolute path Bazel wrote.
 [ -L MODULE.bazel ] || { echo "MODULE.bazel missing from runfiles" >&2; exit 1; }
 WORKSPACE="$(dirname "$(readlink MODULE.bazel)")"
 cd "$WORKSPACE"
+
 # `-c submodule.recurse=false` keeps git ls-files from descending into
 # submodules (src/sta, third-party/abc, third-party/slang-elab and the
 # fmt sub-submodule nested in it) — we never want to reformat files
 # owned by another repo. The override is needed because CI sets
 # submodule.recurse=true globally.
 # Explicit -mode=check -lint=off separates format errors from lint warnings,
 # and overrides the repo-root .buildifier.json default (mode: fix).
-git -c submodule.recurse=false ls-files \
+"${GIT}" -c submodule.recurse=false ls-files \
         '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
-    | xargs -0 "$TOOL" -mode=check -lint=off
+    | xargs -0 "${TOOL}" -mode=check -lint=off

bazel/bzl_fmt_test.sh

@@ -3,20 +3,25 @@
 # Copyright (c) 2025-2026, The OpenROAD Authors
 #
 # Lint all Bazel files using buildifier (check-only, with lint warnings).
+
 set -euo pipefail
-TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+
+TOOL="$(realpath "$1")"
+GIT="$(realpath "$2")"
+
 # MODULE.bazel must be in the sh_test `data` deps so it appears as a
 # runfiles symlink pointing at the real workspace. `readlink` (no -f,
 # for macOS portability) resolves the absolute path Bazel wrote.
 [ -L MODULE.bazel ] || { echo "MODULE.bazel missing from runfiles" >&2; exit 1; }
 WORKSPACE="$(dirname "$(readlink MODULE.bazel)")"
 cd "$WORKSPACE"
+
 # `-c submodule.recurse=false` keeps git ls-files from descending into
 # submodules (src/sta, third-party/abc, third-party/slang-elab and the
 # fmt sub-submodule nested in it) — we never want to reformat files
 # owned by another repo. The override is needed because CI sets
 # submodule.recurse=true globally.
 # Explicit -mode=check overrides the repo-root .buildifier.json default.
-git -c submodule.recurse=false ls-files \
+"${GIT}" -c submodule.recurse=false ls-files \
         '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
-    | xargs -0 "$TOOL" -mode=check -lint=warn
+    | xargs -0 "${TOOL}" -mode=check -lint=warn

bazel/bzl_lint_test.sh

@@ -3,8 +3,13 @@
 # Copyright (c) 2025-2025, The OpenROAD Authors
 #
 # Check that all TCL files are properly formatted.
+
 set -euo pipefail
-TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+
+TOOL="$(realpath "$1")"
+GIT="$(realpath "$2")"
+
 WORKSPACE="$(dirname "$(readlink -f tclint.toml)")"
 cd "$WORKSPACE"
-git ls-files '*.tcl' '*.sdc' '*.upf' -z | xargs -0 "$TOOL" --check
+
+"${GIT}" ls-files '*.tcl' '*.sdc' '*.upf' -z | xargs -0 "${TOOL}" --check

bazel/tcl_fmt_test.sh

@@ -3,8 +3,13 @@
 # Copyright (c) 2025-2025, The OpenROAD Authors
 #
 # Lint all TCL files using tclint.
+
 set -euo pipefail
-TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+
+TOOL="$(realpath "$1")"
+GIT="$(realpath "$2")"
+
 WORKSPACE="$(dirname "$(readlink -f tclint.toml)")"
 cd "$WORKSPACE"
-git ls-files '*.tcl' '*.sdc' '*.upf' -z | xargs -0 "$TOOL"
+
+"${GIT}" ls-files '*.tcl' '*.sdc' '*.upf' -z | xargs -0 "${TOOL}"