From 0d40efbe6676ba52f31d504e5da9bd82d8425cdd Mon Sep 17 00:00:00 2001 From: Riteo Date: Sun, 8 Sep 2024 16:30:29 +0200 Subject: [PATCH] Build: make ninja output file consistent After upgrading, I noticed that the SCons ninja output had a different filename which messed up the "flaky file" logic. This patch explicitly passes it to the tool and switches to `build.ninja` (ninja's default). --- SConstruct | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 5c1ccd24492..178f2d86a20 100644 --- a/SConstruct +++ b/SConstruct @@ -1053,7 +1053,7 @@ if env["ninja"]: SetOption("experimental", "ninja") env["NINJA_FILE_NAME"] = env["ninja_file"] env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"] - env.Tool("ninja") + env.Tool("ninja", "build.ninja") # Threads if env["threads"]: @@ -1116,7 +1116,7 @@ atexit.register(print_elapsed_time) def purge_flaky_files(): - paths_to_keep = ["ninja.build"] + paths_to_keep = ["build.ninja"] for build_failure in GetBuildFailures(): path = build_failure.node.path if os.path.isfile(path) and path not in paths_to_keep: