Change test_isolation_mode default from noop to check

TBR=maruel@chromium.org
NOTRY=True
BUG=


Review URL: https://chromiumcodereview.appspot.com/12623013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187625 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 27 insertions, 17 deletions

diff --git a/build/common.gypi b/build/common.gypi
index afaec38..5498de8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -111,6 +111,11 @@
         # 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', {
@@ -172,6 +177,7 @@
       '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)',
@@ -180,11 +186,6 @@
       # 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,
@@ -384,18 +385,11 @@
       # 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',
@@ -613,6 +607,18 @@
           '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
@@ -717,6 +723,7 @@
     '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/build/isolate.gypi b/build/isolate.gypi
index 6ddc3fe..d7523fd 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -40,7 +40,6 @@
       'rule_name': 'isolate',
       'extension': 'isolate',
       'inputs': [
-        '<(RULE_INPUT_PATH)',
         # Disable file tracking by the build driver for now. This means the
         # project must have the proper build-time dependency for their runtime
         # dependency. This improves the runtime of the build driver since it
@@ -60,6 +59,7 @@
         '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)',
@@ -72,8 +72,11 @@
             '--outdir', '<(PRODUCT_DIR)/<(test_isolation_outdir)',
           ],
         }],
+        ['test_isolation_fail_on_missing == 0', {
+            'action': ['--ignore_broken_items']
+          },
+        ],
       ],
-
       'msvs_cygwin_shell': 0,
     },
   ],