Add a new gyp define to be used by the swarm master.

Rename tests_run to test_isolation_mode. TBR=mad@chromium.org BUG=98636 TEST= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10392073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137127 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · May 15, 2012 · 0ef3a52 · 0ef3a52
1 parent 723be5d
commit 0ef3a52
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/base/base.gyp b/base/base.gyp
@@ -491,7 +491,8 @@
           'action': [
             'python',
             '../tools/isolate/isolate.py',
-            '--mode', '<(tests_run)',
+            '--mode', '<(test_isolation_mode)',
+            '--outdir', '<(test_isolation_outdir)',
             '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
             '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',

diff --git a/build/common.gypi b/build/common.gypi
@@ -338,7 +338,10 @@
       # 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.
-      'tests_run%': 'noop',
+      'test_isolation_mode%': 'noop',
+      # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise
+      # gyp will remove duplicate flags, causing isolate.py to be confused.
+      'test_isolation_outdir%': '<(PRODUCT_DIR)/',
 
        # Force rlz to use chrome's networking stack.
       'force_rlz_use_chrome_net%': 1,
@@ -558,7 +561,8 @@
     'linux_use_gold_binary%': '<(linux_use_gold_binary)',
     'linux_use_gold_flags%': '<(linux_use_gold_flags)',
     'use_canvas_skia%': '<(use_canvas_skia)',
-    'tests_run%': '<(tests_run)',
+    'test_isolation_mode%': '<(test_isolation_mode)',
+    'test_isolation_outdir%': '<(test_isolation_outdir)',
     'enable_automation%': '<(enable_automation)',
     'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
     'enable_task_manager%': '<(enable_task_manager)',

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
@@ -2503,7 +2503,8 @@
           'action': [
             'python',
             '../tools/isolate/isolate.py',
-            '--mode', '<(tests_run)',
+            '--mode', '<(test_isolation_mode)',
+            '--outdir', '<(test_isolation_outdir)',
             '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
             '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',
@@ -3323,7 +3324,8 @@
           'action': [
             'python',
             '../tools/isolate/isolate.py',
-            '--mode', '<(tests_run)',
+            '--mode', '<(test_isolation_mode)',
+            '--outdir', '<(test_isolation_outdir)',
             '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
             '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',

diff --git a/net/net.gyp b/net/net.gyp
@@ -1393,7 +1393,8 @@
           'action': [
             'python',
             '../tools/isolate/isolate.py',
-            '--mode', '<(tests_run)',
+            '--mode', '<(test_isolation_mode)',
+            '--outdir', '<(test_isolation_outdir)',
             '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
             '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',

diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -231,7 +231,8 @@
           'action': [
             'python',
             '../../tools/isolate/isolate.py',
-            '--mode', '<(tests_run)',
+            '--mode', '<(test_isolation_mode)',
+            '--outdir', '<(test_isolation_outdir)',
             '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
             '--variable', 'OS', '<(OS)',
             '--result', '<@(_outputs)',