Skip to content

Commit 0d40efb

Browse files
committed
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).
1 parent 5675c76 commit 0d40efb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

SConstruct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ if env["ninja"]:
10531053
SetOption("experimental", "ninja")
10541054
env["NINJA_FILE_NAME"] = env["ninja_file"]
10551055
env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"]
1056-
env.Tool("ninja")
1056+
env.Tool("ninja", "build.ninja")
10571057

10581058
# Threads
10591059
if env["threads"]:
@@ -1116,7 +1116,7 @@ atexit.register(print_elapsed_time)
11161116

11171117

11181118
def purge_flaky_files():
1119-
paths_to_keep = ["ninja.build"]
1119+
paths_to_keep = ["build.ninja"]
11201120
for build_failure in GetBuildFailures():
11211121
path = build_failure.node.path
11221122
if os.path.isfile(path) and path not in paths_to_keep:

0 commit comments

Comments
 (0)