libv8 5.3.332.38.5 → 5.6.326.50.0beta1

data/vendor/depot_tools/recipe_modules/gclient/__init__.py

@@ -8,3 +8,7 @@ DEPS = [
   'recipe_engine/step',
   'tryserver',
 ]
+
+
+# TODO(phajdan.jr): provide coverage (http://crbug.com/693058).
+DISABLE_STRICT_COVERAGE = True

data/vendor/depot_tools/recipe_modules/gclient/api.py

@@ -117,7 +117,7 @@ class GclientApi(recipe_api.RecipeApi):
   def get_config_defaults(self):
     return {
       'USE_MIRROR': self.use_mirror,
-      'CACHE_DIR': self.m.path['git_cache'],
+      'CACHE_DIR': self.m.infra_paths.default_git_cache_dir,
     }
 
   @staticmethod
@@ -133,8 +133,6 @@ class GclientApi(recipe_api.RecipeApi):
     revisions = []
     self.set_patch_project_revision(self.m.properties.get('patch_project'), cfg)
     for i, s in enumerate(cfg.solutions):
-      if s.safesync_url:  # prefer safesync_url in gclient mode
-        continue
       if i == 0 and s.revision is None:
         s.revision = RevisionFallbackChain()
 
@@ -240,33 +238,22 @@ class GclientApi(recipe_api.RecipeApi):
         name = 'recurse (git config %s)' % var
         self(name, ['recurse', 'git', 'config', var, val], **kwargs)
     finally:
-      cwd = kwargs.get('cwd', self.m.path['slave_build'])
+      cwd = kwargs.get('cwd', self.m.path['start_dir'])
       if 'checkout' not in self.m.path:
         self.m.path['checkout'] = cwd.join(
           *cfg.solutions[0].name.split(self.m.path.sep))
 
     return sync_step
 
-  def revert(self, **kwargs):  # pragma: no cover
-    """Return a gclient_safe_revert step."""
-    # Not directly calling gclient, so don't use self().
-    alias = self.spec_alias
-    prefix = '%sgclient ' % (('[spec: %s] ' % alias) if alias else '')
-
-    return self.m.python(prefix + 'revert',
-        self.m.path['build'].join('scripts', 'slave', 'gclient_safe_revert.py'),
-        ['.', self.m.path['depot_tools'].join('gclient',
-                                              platform_ext={'win': '.bat'})],
-        infra_step=True,
-        **kwargs
-    )
-
   def runhooks(self, args=None, name='runhooks', **kwargs):
     args = args or []
     assert isinstance(args, (list, tuple))
-    kwargs.setdefault('cwd', self.m.path['checkout'])
-    return self(
-      name, ['runhooks'] + list(args), infra_step=False, **kwargs)
+    context = {}
+    if not self.m.step.get_from_context('cwd') and self.m.path['checkout']:
+      context['cwd'] = self.m.path['checkout']
+    with self.m.step.context(context):
+      return self(
+        name, ['runhooks'] + list(args), infra_step=False, **kwargs)
 
   @property
   def is_blink_mode(self):
@@ -299,7 +286,7 @@ class GclientApi(recipe_api.RecipeApi):
                 print 'deleting %s' % path_to_file
                 os.remove(path_to_file)
       """,
-      args=[self.m.path['slave_build']],
+      args=[self.m.path['start_dir']],
       infra_step=True,
     )
 

data/vendor/depot_tools/recipe_modules/gclient/config.py

@@ -143,6 +143,7 @@ def chromium_bare(c):
   p['pdfium'] = ('src/third_party/pdfium', 'HEAD')
   p['skia'] = ('src/third_party/skia', 'HEAD')
   p['v8'] = ('src/v8', 'HEAD')
+  p['v8/v8'] = ('src/v8', 'HEAD')
   p['webrtc'] = ('src/third_party/webrtc', 'HEAD')
 
 @config_ctx(includes=['chromium_bare'])
@@ -389,22 +390,30 @@ def chromium_skia(c):
 
 @config_ctx(includes=['chromium'])
 def chromium_webrtc(c):
-  c.got_revision_mapping['src/third_party/libjingle/source/talk'] = (
-      'got_libjingle_revision')
   c.got_revision_mapping['src/third_party/libvpx/source'] = (
       'got_libvpx_revision')
 
 @config_ctx(includes=['chromium_webrtc'])
 def chromium_webrtc_tot(c):
-  """Configures ToT revisions for WebRTC and Libjingle for Chromium.
+  """Configures WebRTC ToT revision for Chromium src/third_party/webrtc.
 
-  Sets up ToT instead of the DEPS-pinned revision for WebRTC and Libjingle.
+  Sets up ToT instead of the DEPS-pinned revision for WebRTC.
   This is used for some bots to provide data about which revisions are green to
   roll into Chromium.
   """
   c.revisions['src'] = 'HEAD'
   c.revisions['src/third_party/webrtc'] = 'HEAD'
-  c.revisions['src/third_party/libjingle/source/talk'] = 'HEAD'
+
+  # Have the WebRTC revision appear in the web UI instead of Chromium's.
+  # This is also important for set_component_rev to work, since got_revision
+  # will become a WebRTC revision instead of Chromium.
+  c.got_revision_mapping['src'] = 'got_cr_revision'
+  c.got_revision_mapping['src/third_party/webrtc'] = 'got_revision'
+
+  # Needed to get the testers to properly sync the right revision.
+  c.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
+  c.parent_got_revision_mapping['parent_got_webrtc_revision'] = (
+      'got_webrtc_revision')
 
 @config_ctx()
 def webrtc_test_resources(c):
@@ -583,3 +592,7 @@ def chromedriver(c):
   c.solutions[0].custom_deps[
       'src/chrome/test/chromedriver/third_party/java_tests'] = (
           ChromiumGitURL(c, 'chromium', 'deps', 'webdriver'))
+
+@config_ctx()
+def ndk_next(c):
+  c.revisions['src/third_party/android_tools/ndk'] = 'origin/next'

data/vendor/depot_tools/recipe_modules/gclient/example.expected/basic.json

@@ -85,13 +85,13 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]"
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient setup"
+    "name": "[spec: Angle] gclient setup"
   },
   {
     "cmd": [
@@ -109,20 +109,20 @@
       "--no-nag-max",
       "--delete_unversioned_trees",
       "--revision",
-      "third_party/WebKit@123",
+      "src/third_party/angle@refs/heads/lkgr",
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient sync",
+    "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"WebKit/\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"Angle/\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/blatley/\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
@@ -144,11 +144,11 @@
       "user.name",
       "local_bot"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient recurse (git config user.name)"
+    "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
     "cmd": [
@@ -161,18 +161,18 @@
       "user.email",
       "local_bot@example.com"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient recurse (git config user.email)"
+    "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
-      "[SLAVE_BUILD]"
+      "[START_DIR]"
     ],
     "name": "cleanup index.lock",
     "~followup_annotations": [
@@ -197,7 +197,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]/src",
+    "cwd": "[START_DIR]/src",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

data/vendor/depot_tools/recipe_modules/gclient/example.expected/buildbot.json

@@ -0,0 +1,211 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "config",
+      "--spec",
+      "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient setup"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "sync",
+      "--verbose",
+      "--with_branch_heads",
+      "--nohooks",
+      "-j8",
+      "--reset",
+      "--force",
+      "--upstream",
+      "--no-nag-max",
+      "--delete_unversioned_trees",
+      "--output-json",
+      "/path/to/tmp/json"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient sync",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "git",
+      "config",
+      "user.name",
+      "local_bot"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient recurse (git config user.name)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "git",
+      "config",
+      "user.email",
+      "local_bot@example.com"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient recurse (git config user.email)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "config",
+      "--spec",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
+    ],
+    "cwd": "[START_DIR]/src/third_party",
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "[spec: Angle] gclient setup"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "sync",
+      "--verbose",
+      "--with_branch_heads",
+      "--nohooks",
+      "-j8",
+      "--reset",
+      "--force",
+      "--upstream",
+      "--no-nag-max",
+      "--delete_unversioned_trees",
+      "--revision",
+      "src/third_party/angle@refs/heads/lkgr",
+      "--output-json",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[START_DIR]/src/third_party",
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "[spec: Angle] gclient sync",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"Angle/\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/blatley/\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@got_blatley_revision@\"5e800497199d615131a76cd10651e74d7c8a0962\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "git",
+      "config",
+      "user.name",
+      "local_bot"
+    ],
+    "cwd": "[START_DIR]/src/third_party",
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "[spec: Angle] gclient recurse (git config user.name)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "git",
+      "config",
+      "user.email",
+      "local_bot@example.com"
+    ],
+    "cwd": "[START_DIR]/src/third_party",
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "[spec: Angle] gclient recurse (git config user.email)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
+      "[START_DIR]"
+    ],
+    "name": "cleanup index.lock",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  for (path, dir, files) in os.walk(build_path):@@@",
+      "@@@STEP_LOG_LINE@python.inline@    for cur_file in files:@@@",
+      "@@@STEP_LOG_LINE@python.inline@      if cur_file.endswith('index.lock'):@@@",
+      "@@@STEP_LOG_LINE@python.inline@        path_to_file = os.path.join(path, cur_file)@@@",
+      "@@@STEP_LOG_LINE@python.inline@        print 'deleting %s' % path_to_file@@@",
+      "@@@STEP_LOG_LINE@python.inline@        os.remove(path_to_file)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "runhooks"
+    ],
+    "cwd": "[START_DIR]/src",
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient runhooks"
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]

data/vendor/depot_tools/recipe_modules/gclient/example.expected/revision.json

@@ -87,13 +87,13 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]"
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient setup"
+    "name": "[spec: Angle] gclient setup"
   },
   {
     "cmd": [
@@ -111,20 +111,22 @@
       "--no-nag-max",
       "--delete_unversioned_trees",
       "--revision",
-      "third_party/WebKit@123",
+      "Angle@abc",
+      "--revision",
+      "src/third_party/angle@refs/heads/lkgr",
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient sync",
+    "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"WebKit/\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"Angle/\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/blatley/\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
@@ -146,11 +148,11 @@
       "user.name",
       "local_bot"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient recurse (git config user.name)"
+    "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
     "cmd": [
@@ -163,18 +165,18 @@
       "user.email",
       "local_bot@example.com"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient recurse (git config user.email)"
+    "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
-      "[SLAVE_BUILD]"
+      "[START_DIR]"
     ],
     "name": "cleanup index.lock",
     "~followup_annotations": [
@@ -199,7 +201,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]/src",
+    "cwd": "[START_DIR]/src",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },