commit 069e76c7de950a35b9f05302919bb347fd372964
author Petr Hosek <phosek@google.com> Tue Jun 12 19:59:48 2018 -0700
committer Petr Hosek <phosek@google.com> Wed Jun 13 03:22:42 2018 +0000
tree a33f851d170562306c33b67ec4477f7f0322fb68
parent a9190c08aa5478a18fd2e5fa01822813fb82466c

Use full path to Ninja binary

We no longer prepend CIPD root directory to PATH so we need to specify
a full path to Ninja binary.

Change-Id: I1bdb6fdc0f4b2a3c80820b26e9da3485fda9ba4a
Reviewed-on: https://gn-review.googlesource.com/1402
Reviewed-by: Scott Graham <scottmg@chromium.org>

infra/recipes/gn.expected/ci_linux.json

diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json
index 81f6cb2..46e2bac 100644
--- a/infra/recipes/gn.expected/ci_linux.json
+++ b/infra/recipes/gn.expected/ci_linux.json
@@ -97,7 +97,7 @@
   },
   {
     "cmd": [
-      "ninja",
+      "[START_DIR]/cipd/ninja",
       "-C",
       "[START_DIR]/gn/out"
     ],

infra/recipes/gn.expected/ci_mac.json

diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json
index 7619c6f..7f8dd06 100644
--- a/infra/recipes/gn.expected/ci_mac.json
+++ b/infra/recipes/gn.expected/ci_mac.json
@@ -87,7 +87,7 @@
   },
   {
     "cmd": [
-      "ninja",
+      "[START_DIR]/cipd/ninja",
       "-C",
       "[START_DIR]/gn/out"
     ],

infra/recipes/gn.expected/ci_win.json

diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json
index b78f9ae..1e6e6b2 100644
--- a/infra/recipes/gn.expected/ci_win.json
+++ b/infra/recipes/gn.expected/ci_win.json
@@ -87,7 +87,7 @@
   },
   {
     "cmd": [
-      "ninja",
+      "[START_DIR]\\cipd\\ninja",
       "-C",
       "[START_DIR]\\gn\\out"
     ],

infra/recipes/gn.expected/cq_linux.json

diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json
index 4fe3e09..b449c10 100644
--- a/infra/recipes/gn.expected/cq_linux.json
+++ b/infra/recipes/gn.expected/cq_linux.json
@@ -124,7 +124,7 @@
   },
   {
     "cmd": [
-      "ninja",
+      "[START_DIR]/cipd/ninja",
       "-C",
       "[START_DIR]/gn/out"
     ],

infra/recipes/gn.expected/cq_mac.json

diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json
index 2f59a09..de1bc86 100644
--- a/infra/recipes/gn.expected/cq_mac.json
+++ b/infra/recipes/gn.expected/cq_mac.json
@@ -114,7 +114,7 @@
   },
   {
     "cmd": [
-      "ninja",
+      "[START_DIR]/cipd/ninja",
       "-C",
       "[START_DIR]/gn/out"
     ],

infra/recipes/gn.expected/cq_win.json

diff --git a/infra/recipes/gn.expected/cq_win.json b/infra/recipes/gn.expected/cq_win.json
index d8da1a0..394a362 100644
--- a/infra/recipes/gn.expected/cq_win.json
+++ b/infra/recipes/gn.expected/cq_win.json
@@ -114,7 +114,7 @@
   },
   {
     "cmd": [
-      "ninja",
+      "[START_DIR]\\cipd\\ninja",
       "-C",
       "[START_DIR]\\gn\\out"
     ],

infra/recipes/gn.py

diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py
index 9c7bf33..a02357d 100644
--- a/infra/recipes/gn.py
+++ b/infra/recipes/gn.py
@@ -67,7 +67,7 @@
     with api.context(env=environ, cwd=src_dir):
       api.python('generate', src_dir.join('build', 'gen.py'))
 
-    api.step('ninja', ['ninja', '-C', src_dir.join('out')])
+    api.step('ninja', [cipd_dir.join('ninja'), '-C', src_dir.join('out')])
 
   with api.context(cwd=src_dir):
     api.step('test', [src_dir.join('out', 'gn_unittests')])