summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorMathew Robinson <mathew@chasinglogic.io>2020-03-03 09:44:13 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-04-26 23:18:08 +0000
commitd9bb2fb9a9ad973c9599dae84d60f78b69422468 (patch)
tree953eb87838ca3ce746994fc9175eb39a9565c7c6 /SConstruct
parent8681bd07e8d7faf130b94ac3577b5075a3a32698 (diff)
downloadmongo-d9bb2fb9a9ad973c9599dae84d60f78b69422468.tar.gz
SERVER-46458 build/unittests.txt does not expand newlines with ninja
(cherry picked from commit 7d095214ed875903d6531a9ba553cd0b94deea14)
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct5
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 9334514bc88..580fd37f93d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3935,8 +3935,9 @@ if get_option('ninja') != 'disabled':
env.NinjaRule(
rule="TEST_LIST",
description="Compiling test list: $out",
- command="{}echo '$files' > '$out'".format(
- "cmd.exe /c " if env["PLATFORM"] == "win32" else "",
+ command="{prefix}echo {flags} '$files' > '$out'".format(
+ prefix="cmd.exe /c " if env["PLATFORM"] == "win32" else "",
+ flags="-n" if env["PLATFORM"] != "win32" else "",
),
)
env.NinjaRegisterFunctionHandler("test_list_builder_action", ninja_test_list_builder)