From a22f2863b364c418358363f0d39037fddeba1e96 Mon Sep 17 00:00:00 2001
From: "csharp@chromium.org"
 <csharp@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Tue, 12 Mar 2013 13:50:53 +0000
Subject: [PATCH] Revert 187575 "Change test_isolation_mode default from noop
 to c..."

> Change test_isolation_mode default from noop to check
>
> NOTRY=True
> TBR=maruel@chromium.org
> BUG=
>
>
> Review URL: https://chromiumcodereview.appspot.com/12454003

TBR=csharp@chromium.org
Review URL: https://codereview.chromium.org/12408025

git-svn-id: http://src.chromium.org/svn/trunk/src/build@187579 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi  | 37 +++++++++++++++----------------------
 isolate.gypi |  6 +-----
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/common.gypi b/common.gypi
index 064c23c64..988b121ee 100644
--- a/common.gypi
+++ b/common.gypi
@@ -111,11 +111,6 @@
         # Sets whether chrome is built for google tv device.
         'google_tv%': 0,
 
-        # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they
-        # are built under a chromium full build (1) or a webkit.org chromium
-        # build (0).
-        'inside_chromium_build%': 1,
-
         'conditions': [
           # Set default value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or use_aura==1', {
@@ -177,7 +172,6 @@
       'enable_touch_ui%': '<(enable_touch_ui)',
       'android_webview_build%': '<(android_webview_build)',
       'google_tv%': '<(google_tv)',
-      'inside_chromium_build%': '<(inside_chromium_build)',
       'enable_app_list%': '<(enable_app_list)',
       'enable_message_center%': '<(enable_message_center)',
       'use_default_render_theme%': '<(use_default_render_theme)',
@@ -186,6 +180,11 @@
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
 
+      # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
+      # are built under a chromium full build (1) or a webkit.org chromium
+      # build (0).
+      'inside_chromium_build%': 1,
+
       # Set to 1 to enable fast builds. It disables debug info for fastest
       # compilation.
       'fastbuild%': 0,
@@ -385,11 +384,18 @@
       # with one of those tools.
       'build_for_tool%': '',
 
+      # Whether tests targets should be run, archived or just have the
+      # dependencies verified. All the tests targets have the '_run' suffix,
+      # e.g. base_unittests_run runs the target base_unittests. The test target
+      # always calls tools/swarm_client/isolate.py. See the script's --help for
+      # more information and the valid --mode values. Meant to be overriden with
+      # GYP_DEFINES.
+      # TODO(maruel): Converted the default from 'check' to 'noop' so work can
+      # be done while the builders are being reconfigured to check out test data
+      # files.
+      'test_isolation_mode%': 'noop',
       # If no directory is specified then a temporary directory will be used.
       'test_isolation_outdir%': '',
-      # True if isolate should fail if the isolate files refer to files
-      # that are missing.
-      'test_isolation_fail_on_missing': 0,
 
       'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
       'wix_path%': '<(DEPTH)/third_party/wix',
@@ -607,18 +613,6 @@
           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
           'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc',
         }],
-
-        # Whether tests targets should be run, archived or just have the
-        # dependencies verified. All the tests targets have the '_run' suffix,
-        # e.g. base_unittests_run runs the target base_unittests. The test
-        # target always calls tools/swarm_client/isolate.py. See the script's
-        # --help for more information and the valid --mode values. Meant to be
-        # overriden with GYP_DEFINES.
-        ['inside_chromium_build==1 and OS != "ios"', {
-            'test_isolation_mode%': 'check',
-        }, {
-            'test_isolation_mode%': 'noop',
-        }],
       ],
 
       # Set this to 1 to use the Google-internal file containing
@@ -723,7 +717,6 @@
     'use_canvas_skia%': '<(use_canvas_skia)',
     'test_isolation_mode%': '<(test_isolation_mode)',
     'test_isolation_outdir%': '<(test_isolation_outdir)',
-    'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)',
     'enable_automation%': '<(enable_automation)',
     'enable_printing%': '<(enable_printing)',
     'enable_google_now%': '<(enable_google_now)',
diff --git a/isolate.gypi b/isolate.gypi
index 12493e07c..6ddc3fef2 100644
--- a/isolate.gypi
+++ b/isolate.gypi
@@ -60,7 +60,6 @@
         'python',
         '<(DEPTH)/tools/swarm_client/isolate.py',
         '<(test_isolation_mode)',
-        '--outdir', '<(test_isolation_outdir)',
         '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
         '--variable', 'OS', '<(OS)',
         '--variable', 'chromeos', '<(chromeos)',
@@ -73,11 +72,8 @@
             '--outdir', '<(PRODUCT_DIR)/<(test_isolation_outdir)',
           ],
         }],
-        ['test_isolation_fail_on_missing == 0', {
-            'action': ['--ignore_broken_items']
-          },
-        ],
       ],
+
       'msvs_cygwin_shell': 0,
     },
   ],