From 0a3b77397b59f3146a6eb4780de3326c4248eb33 Mon Sep 17 00:00:00 2001
From: machenbach <machenbach@chromium.org>
Date: Mon, 13 Jul 2015 05:39:15 -0700
Subject: [PATCH] Prepare for using ninja for win64.

BUG=chromium:508921
LOG=n

Review URL: https://codereview.chromium.org/1234443003

Cr-Commit-Position: refs/heads/master@{#29605}
---
 build/standalone.gypi | 13 +++++++++++++
 tools/run-tests.py    | 13 +++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/build/standalone.gypi b/build/standalone.gypi
index 2cd0b51..788b96e 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -358,6 +358,19 @@
       'Release': {
         'cflags+': ['<@(release_extra_cflags)'],
       },
+      'conditions': [
+        ['OS=="win"', {
+          'Optdebug_x64': {
+            'inherit_from': ['Optdebug'],
+          },
+          'Debug_x64': {
+            'inherit_from': ['Debug'],
+          },
+          'Release_x64': {
+            'inherit_from': ['Release'],
+          },
+        }],
+      ],
     },
     'conditions':[
       ['(clang==1 or host_clang==1) and OS!="win"', {
diff --git a/tools/run-tests.py b/tools/run-tests.py
index 7647627..669a156 100755
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -322,6 +322,15 @@ def RandomSeed():
   return seed
 
 
+def BuildbotToV8Mode(config):
+  """Convert buildbot build configs to configs understood by the v8 runner.
+
+  V8 configs are always lower case and without the additional _x64 suffix for
+  64 bit builds on windows with ninja.
+  """
+  mode = config[:-4] if config.endswith('_x64') else config
+  return mode.lower()
+
 def ProcessOptions(options):
   global VARIANT_FLAGS
   global VARIANTS
@@ -334,7 +343,7 @@ def ProcessOptions(options):
     options.mode = ",".join([tokens[1] for tokens in options.arch_and_mode])
   options.mode = options.mode.split(",")
   for mode in options.mode:
-    if not mode.lower() in MODES:
+    if not BuildbotToV8Mode(mode) in MODES:
       print "Unknown mode %s" % mode
       return False
   if options.arch in ["auto", "native"]:
@@ -531,7 +540,7 @@ def Execute(arch, mode, args, options, suites, workspace):
       # TODO(machenbach): Get rid of different output folder location on
       # buildbot. Currently this is capitalized Release and Debug.
       shell_dir = os.path.join(workspace, options.outdir, mode)
-      mode = mode.lower()
+      mode = BuildbotToV8Mode(mode)
     else:
       shell_dir = os.path.join(
           workspace,
-- 
2.7.4