[swarming] Add isolate configs for d8 on linux.

BUG=chromium:535160
LOG=n

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

Cr-Commit-Position: refs/heads/master@{#30943}

diff --git a/.gitignore b/.gitignore
index cc5606e8547162ec71acb72462ab03b2f915f26f..337a5531e8a44462decf771104628a1cf05e2ba4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ shell_g
 /tools/jsfunfuzz.zip
 /tools/oom_dump/oom_dump
 /tools/oom_dump/oom_dump.o
+/tools/swarming_client
 /tools/visual_studio/Debug
 /tools/visual_studio/Release
 /v8.log.ll

diff --git a/DEPS b/DEPS
index 5fb47bf3b5e5357fd3a7a3b61ec78e085abdf686..56883a6c587a6998171a59dc22bebc7f358c45e2 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -13,6 +13,8 @@ deps = {
     Var("git_url") + "/chromium/deps/icu.git" + "@" + "6b3ce817f8e828c3b7a577d2395f0882eb56ef18",
   "v8/buildtools":
     Var("git_url") + "/chromium/buildtools.git" + "@" + "f7310ee61725e68b1c8921e381830362cf4f0999",
+  "v8/tools/swarming_client":
+    Var('git_url') + '/external/swarming.client.git' + '@' + "6e5d2b21f0ac98396cd736097a985346feed1328",
   "v8/testing/gtest":
     Var("git_url") + "/external/googletest.git" + "@" + "9855a87157778d39b95eccfb201a9dc90f6d61c6",
   "v8/testing/gmock":

diff --git a/build/isolate.gypi b/build/isolate.gypi
new file mode 100644 (file)
index 0000000..9e2a3bf
--- /dev/null
+++ b/build/isolate.gypi
@@ -0,0 +1,74 @@
+# Copyright 2015 the V8 project authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is meant to be included into a target to provide a rule
+# to "build" .isolate files into a .isolated file.
+#
+# To use this, create a gyp target with the following form:
+# 'conditions': [
+#   ['test_isolation_mode != "noop"', {
+#     'targets': [
+#       {
+#         'target_name': 'foo_test_run',
+#         'type': 'none',
+#         'dependencies': [
+#           'foo_test',
+#         ],
+#         'includes': [
+#           '../build/isolate.gypi',
+#         ],
+#         'sources': [
+#           'foo_test.isolate',
+#         ],
+#       },
+#     ],
+#   }],
+# ],
+#
+# Note: foo_test.isolate is included and a source file. It is an inherent
+# property of the .isolate format. This permits to define GYP variables but is
+# a stricter format than GYP so isolate.py can read it.
+#
+# The generated .isolated file will be:
+#   <(PRODUCT_DIR)/foo_test.isolated
+#
+# See http://dev.chromium.org/developers/testing/isolated-testing/for-swes
+# for more information.
+
+{
+  'rules': [
+    {
+      'rule_name': 'isolate',
+      'extension': 'isolate',
+      'inputs': [
+        # Files that are known to be involved in this step.
+        '<(DEPTH)/tools/swarming_client/isolate.py',
+        '<(DEPTH)/tools/swarming_client/run_isolated.py',
+      ],
+      'outputs': [
+        '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
+      ],
+      'action': [
+        'python',
+        '<(DEPTH)/tools/swarming_client/isolate.py',
+        '<(test_isolation_mode)',
+        '--isolated', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
+        '--isolate', '<(RULE_INPUT_PATH)',
+
+        # Variables should use the -V FOO=<(FOO) form so frequent values,
+        # like '0' or '1', aren't stripped out by GYP. Run 'isolate.py help'
+        # for more details.
+
+        # Path variables are used to replace file paths when loading a .isolate
+        # file
+        '--path-variable', 'DEPTH', '<(DEPTH)',
+        '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+
+        '--config-variable', 'OS=<(OS)',
+        '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',
+      ],
+    },
+  ],
+}

diff --git a/build/standalone.gypi b/build/standalone.gypi
index 8eff11ba47f1ef0c1103196528b1ab597838011b..1654be2786301d8c6aee788a5912536d7e44c594 100644 (file)
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -124,6 +124,14 @@
         }, {
           'linux_use_bundled_gold%': 0,
         }],
+
+        # TODO(machenbach): Remove the conditions as more configurations are
+        # supported.
+        ['OS=="linux"', {
+          'test_isolation_mode%': 'check',
+        }, {
+          'test_isolation_mode%': 'noop',
+        }],
       ],
     },
     'base_dir%': '<(base_dir)',
@@ -146,6 +154,7 @@
     'cfi_vptr%': '<(cfi_vptr)',
     'cfi_diag%': '<(cfi_diag)',
     'cfi_blacklist%': '<(cfi_blacklist)',
+    'test_isolation_mode%': '<(test_isolation_mode)',
 
     # Add a simple extras solely for the purpose of the cctests
     'v8_extra_library_files': ['../test/cctest/test-extra.js'],

diff --git a/src/base.isolate b/src/base.isolate
new file mode 100644 (file)
index 0000000..dceb413
--- /dev/null
+++ b/src/base.isolate
@@ -0,0 +1,15 @@
+# Copyright 2015 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'conditions': [
+    ['v8_use_external_startup_data==1', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/natives_blob.bin',
+          '<(PRODUCT_DIR)/snapshot_blob.bin',
+        ],
+      },
+    }],
+  ],
+}
\ No newline at end of file

diff --git a/src/d8.gyp b/src/d8.gyp
index f7e36dd9c970a2d8a33eeec8d67839c0a94d93a6..9594f4ff5a172874a7124b9ea1c79672a7c18660 100644 (file)
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -138,6 +138,25 @@
           ],
         },
       ],
-    }
+    },
+  ],
+  'conditions': [
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'd8_run',
+          'type': 'none',
+          'dependencies': [
+            'd8',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'd8.isolate',
+          ],
+        },
+      ],
+    }],
   ],
 }

diff --git a/src/d8.isolate b/src/d8.isolate
new file mode 100644 (file)
index 0000000..1c9bd9e
--- /dev/null
+++ b/src/d8.isolate
@@ -0,0 +1,16 @@
+# Copyright 2015 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/d8<(EXECUTABLE_SUFFIX)',
+    ],
+    'files': [
+      '<(PRODUCT_DIR)/d8<(EXECUTABLE_SUFFIX)',
+    ],
+  },
+  'includes': [
+    'base.isolate',
+  ],
+}
\ No newline at end of file