Fix the failing windows builder by adding a .exe suffix Also rerun `python3 infra/recipes.py test train`, as I forgot to do so last time. Bug: None Change-Id: I4673cd468f7eb3e57ed3d454d9100c756a6a6964 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/23320 Reviewed-by: Takuto Ikuta <tikuta@google.com>
diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json index 0e2149a..0f549e4 100644 --- a/infra/recipes/gn.expected/ci_win.json +++ b/infra/recipes/gn.expected/ci_win.json
@@ -280,8 +280,8 @@ "[START_DIR]\\cipd\\ninja", "-C", "[START_DIR]\\gn\\out", - "gn", - "gn_unittests" + "gn.exe", + "gn_unittests.exe" ], "cwd": "[START_DIR]\\gn", "env": { @@ -389,8 +389,8 @@ "[START_DIR]\\cipd\\ninja", "-C", "[START_DIR]\\gn\\out", - "gn", - "gn_unittests" + "gn.exe", + "gn_unittests.exe" ], "cwd": "[START_DIR]\\gn", "env": {
diff --git a/infra/recipes/gn.expected/cq_win.json b/infra/recipes/gn.expected/cq_win.json index ed9cf24..17c6df3 100644 --- a/infra/recipes/gn.expected/cq_win.json +++ b/infra/recipes/gn.expected/cq_win.json
@@ -331,8 +331,8 @@ "[START_DIR]\\cipd\\ninja", "-C", "[START_DIR]\\gn\\out", - "gn", - "gn_unittests" + "gn.exe", + "gn_unittests.exe" ], "cwd": "[START_DIR]\\gn", "env": { @@ -440,8 +440,8 @@ "[START_DIR]\\cipd\\ninja", "-C", "[START_DIR]\\gn\\out", - "gn", - "gn_unittests" + "gn.exe", + "gn_unittests.exe" ], "cwd": "[START_DIR]\\gn", "env": {
diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py index 443ce2a..535ca4f 100644 --- a/infra/recipes/gn.py +++ b/infra/recipes/gn.py
@@ -264,7 +264,11 @@ # Windows requires the environment modifications when building too. ninja_cmd = [cipd_dir.join('ninja'), '-C', src_dir.join('out')] - api.step('build', ninja_cmd + ['gn', 'gn_unittests']) + exe_suffix = '.exe' if target.is_win else '' + api.step('build', ninja_cmd + [ + f'gn{exe_suffix}', + f'gn_unittests{exe_suffix}', + ]) if target.is_host: api.step('test', [src_dir.join('out', 'gn_unittests')])