From 8dfc176671d7067135b59c7e3b38b48f37236a33 Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Wed, 21 Jan 2026 08:59:05 +0100 Subject: [PATCH 1/2] Fix ignore comment --- test/unit/external_repository/test_external_repo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/external_repository/test_external_repo.py b/test/unit/external_repository/test_external_repo.py index 0028bd3c..73438bf5 100644 --- a/test/unit/external_repository/test_external_repo.py +++ b/test/unit/external_repository/test_external_repo.py @@ -79,7 +79,7 @@ def test_compile_commands_external_lib(self): "bazel build :compile_commands_isystem") self.assertEqual(ret, 0) comp_json_file = os.path.join( - self.BAZEL_BIN_DIR, # pyright: ignore[reportOptionalOperand] + self.BAZEL_BIN_DIR, # pyright: ignore "compile_commands_isystem", "compile_commands.json") From b82da51a91b1540c3b964839775c7dd57d544d27 Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Wed, 21 Jan 2026 08:59:15 +0100 Subject: [PATCH 2/2] Add support for BAZEL 8 --- test/unit/external_repository/test_external_repo.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/unit/external_repository/test_external_repo.py b/test/unit/external_repository/test_external_repo.py index 73438bf5..147de73b 100644 --- a/test/unit/external_repository/test_external_repo.py +++ b/test/unit/external_repository/test_external_repo.py @@ -88,10 +88,14 @@ def test_compile_commands_external_lib(self): pattern1 = "-isystem external/external_lib~override/include" pattern2 = "-isystem " + \ "bazel-out/k8-fastbuild/bin/external/external_lib~override/include" - else: + elif self.BAZEL_VERSION.startswith("7"): # type:ignore pattern1 = "-isystem external/external_lib~/include" pattern2 = "-isystem " + \ "bazel-out/k8-fastbuild/bin/external/external_lib~/include" + else: + pattern1 = r"-isystem external/external_lib\+/include" + pattern2 = r"-isystem " + \ + r"bazel-out/k8-fastbuild/bin/external/external_lib\+/include" self.assertTrue(self.contains_regex_in_file( comp_json_file,