ninja icon indicating copy to clipboard operation
ninja copied to clipboard

fix: Jobserver.ParseNativeMakeFlagsValue test on Windows

Open mayeut opened this issue 5 months ago • 1 comments

This PR fixes the Jobserver.ParseNativeMakeFlagsValue test failure on Windows specific to the Kitware fork. Issue found while working on https://github.com/scikit-build/ninja-python-distributions/pull/305#issuecomment-3146299285 The fix has been tested in CI using the following diff for ninja-python-distributions:

diff --git a/.gitmodules b/.gitmodules
index fa0442c..7983d13 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ninja-upstream"]
        path = ninja-upstream
-       url = https://github.com/Kitware/ninja.git
+       url = https://github.com/mayeut/kitware-ninja.git
diff --git a/ninja-upstream b/ninja-upstream
index d74efef..c12e96c 160000
--- a/ninja-upstream
+++ b/ninja-upstream
@@ -1 +1 @@
-Subproject commit d74efef9fa331d3ae60b62479d49254827c081fe
+Subproject commit c12e96cab1fc7076c71855dbbe4c46a87206cb2b
diff --git a/pyproject.toml b/pyproject.toml
index 63b533a..1df2eca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -142,11 +142,6 @@ select = "*_s390x"
 inherit.config-settings = "append"
 config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-DepsLogTest.MalformedDepsLog"}
 
-# Doesn't account for platform in 1.13.0 https://github.com/scikit-build/ninja-python-distributions/pull/305#issuecomment-3146299285
-[[tool.cibuildwheel.overrides]]
-select = "*-win*"
-inherit.config-settings = "append"
-config-settings = {"cmake.define.TEST_OPTS" = "--gtest_filter=-Jobserver.ParseNativeMakeFlagsValue"}
 
 
 [tool.pytest.ini_options]

mayeut avatar Aug 02 '25 09:08 mayeut

Ideally, this fix could be included in a future kitware 1.13.1 release now that upstream ninja released 1.13.1

mayeut avatar Aug 02 '25 12:08 mayeut