From 72800e47b5c1800dc9ae3f41f4484da11ff91a2d Mon Sep 17 00:00:00 2001
From: Quinten Yearsley <qyearsley@google.com>
Date: Tue, 23 May 2017 14:14:45 -0700
Subject: [PATCH] Change shebang line in WebKit/Tools/Scripts/* to use vpython.

By adding vpython to the shebang line of scripts in
//third_party/WebKit/Tools/Scripts/.

The purpose of this change would be to ensure that these scripts don't
rely on packages in PYTHONPATH that may be present in some systems but
not others.

However, this does mean that we're assuming that depot_tools is
in PATH, or this is running on a bot that supplies vpython.

Related CL: https://crrev.com/c/508124

Bug: 670994
Change-Id: Id22fd75cfa0f6c174d2b207a4d6c15fbda9dd6cf
Reviewed-on: https://chromium-review.googlesource.com/513403
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#474674}
---
 third_party/WebKit/Tools/Scripts/bisect-test-ordering           | 2 +-
 .../WebKit/Tools/Scripts/check-testharness-expected-pass        | 2 +-
 third_party/WebKit/Tools/Scripts/check-webkit-style             | 2 +-
 third_party/WebKit/Tools/Scripts/format-webkitpy                | 2 +-
 third_party/WebKit/Tools/Scripts/lint-test-expectations         | 2 +-
 third_party/WebKit/Tools/Scripts/lint-webkitpy                  | 2 +-
 third_party/WebKit/Tools/Scripts/merge-layout-test-results      | 2 +-
 third_party/WebKit/Tools/Scripts/print-json-test-results        | 2 +-
 third_party/WebKit/Tools/Scripts/print-layout-test-times        | 2 +-
 third_party/WebKit/Tools/Scripts/print-layout-test-types        | 2 +-
 .../WebKit/Tools/Scripts/print-stale-test-expectations-entries  | 2 +-
 third_party/WebKit/Tools/Scripts/print-test-ordering            | 2 +-
 third_party/WebKit/Tools/Scripts/read-checksum-from-png         | 2 +-
 third_party/WebKit/Tools/Scripts/run-bindings-tests             | 2 +-
 third_party/WebKit/Tools/Scripts/run-blink-httpd                | 2 +-
 third_party/WebKit/Tools/Scripts/run-blink-websocketserver      | 2 +-
 third_party/WebKit/Tools/Scripts/run-blink-wptserve             | 2 +-
 third_party/WebKit/Tools/Scripts/run-inspector-tests            | 2 +-
 third_party/WebKit/Tools/Scripts/run-perf-tests                 | 2 +-
 third_party/WebKit/Tools/Scripts/run-webkit-tests               | 2 +-
 third_party/WebKit/Tools/Scripts/test-webkitpy                  | 2 +-
 third_party/WebKit/Tools/Scripts/update-flaky-expectations      | 2 +-
 third_party/WebKit/Tools/Scripts/webkit-patch                   | 2 +-
 third_party/WebKit/Tools/Scripts/wpt-export                     | 2 +-
 third_party/WebKit/Tools/Scripts/wpt-import                     | 2 +-
 third_party/WebKit/Tools/Scripts/wpt-update-expectations        | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/third_party/WebKit/Tools/Scripts/bisect-test-ordering b/third_party/WebKit/Tools/Scripts/bisect-test-ordering
index fb29644b461eb6..bf9bda1f3b1eef 100755
--- a/third_party/WebKit/Tools/Scripts/bisect-test-ordering
+++ b/third_party/WebKit/Tools/Scripts/bisect-test-ordering
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/check-testharness-expected-pass b/third_party/WebKit/Tools/Scripts/check-testharness-expected-pass
index 63a4ff2b75293b..e2ef959c8d1566 100755
--- a/third_party/WebKit/Tools/Scripts/check-testharness-expected-pass
+++ b/third_party/WebKit/Tools/Scripts/check-testharness-expected-pass
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/third_party/WebKit/Tools/Scripts/check-webkit-style b/third_party/WebKit/Tools/Scripts/check-webkit-style
index 54ca276ead1ae6..3c7664f9984997 100755
--- a/third_party/WebKit/Tools/Scripts/check-webkit-style
+++ b/third_party/WebKit/Tools/Scripts/check-webkit-style
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 #
 # Copyright (C) 2011 Google Inc. All rights reserved.
 # Copyright (C) 2010 Chris Jerdonek (chris.jerdonek@gmail.com)
diff --git a/third_party/WebKit/Tools/Scripts/format-webkitpy b/third_party/WebKit/Tools/Scripts/format-webkitpy
index d96c0c43cce521..74522a93919b3f 100755
--- a/third_party/WebKit/Tools/Scripts/format-webkitpy
+++ b/third_party/WebKit/Tools/Scripts/format-webkitpy
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2014 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.
diff --git a/third_party/WebKit/Tools/Scripts/lint-test-expectations b/third_party/WebKit/Tools/Scripts/lint-test-expectations
index d7d3127461a8ff..17a2ea17d152a3 100755
--- a/third_party/WebKit/Tools/Scripts/lint-test-expectations
+++ b/third_party/WebKit/Tools/Scripts/lint-test-expectations
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/lint-webkitpy b/third_party/WebKit/Tools/Scripts/lint-webkitpy
index dde88ff83d761b..39abccf255e39f 100755
--- a/third_party/WebKit/Tools/Scripts/lint-webkitpy
+++ b/third_party/WebKit/Tools/Scripts/lint-webkitpy
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/merge-layout-test-results b/third_party/WebKit/Tools/Scripts/merge-layout-test-results
index 80a2d416930763..42778a331c60cb 100755
--- a/third_party/WebKit/Tools/Scripts/merge-layout-test-results
+++ b/third_party/WebKit/Tools/Scripts/merge-layout-test-results
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 #
 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/third_party/WebKit/Tools/Scripts/print-json-test-results b/third_party/WebKit/Tools/Scripts/print-json-test-results
index 3bbd672999920d..5c52caf3cf7a69 100755
--- a/third_party/WebKit/Tools/Scripts/print-json-test-results
+++ b/third_party/WebKit/Tools/Scripts/print-json-test-results
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 import json
 import optparse
 import os
diff --git a/third_party/WebKit/Tools/Scripts/print-layout-test-times b/third_party/WebKit/Tools/Scripts/print-layout-test-times
index 20019957724b73..747ab66f398be1 100755
--- a/third_party/WebKit/Tools/Scripts/print-layout-test-times
+++ b/third_party/WebKit/Tools/Scripts/print-layout-test-times
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
diff --git a/third_party/WebKit/Tools/Scripts/print-layout-test-types b/third_party/WebKit/Tools/Scripts/print-layout-test-types
index 3cc36c64bb26eb..1676c61fb793eb 100755
--- a/third_party/WebKit/Tools/Scripts/print-layout-test-types
+++ b/third_party/WebKit/Tools/Scripts/print-layout-test-types
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
diff --git a/third_party/WebKit/Tools/Scripts/print-stale-test-expectations-entries b/third_party/WebKit/Tools/Scripts/print-stale-test-expectations-entries
index 75e117ddd0768a..0c4d5746f8cfe0 100755
--- a/third_party/WebKit/Tools/Scripts/print-stale-test-expectations-entries
+++ b/third_party/WebKit/Tools/Scripts/print-stale-test-expectations-entries
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
diff --git a/third_party/WebKit/Tools/Scripts/print-test-ordering b/third_party/WebKit/Tools/Scripts/print-test-ordering
index 7e7b35e6602f09..1b5405e499ee2a 100755
--- a/third_party/WebKit/Tools/Scripts/print-test-ordering
+++ b/third_party/WebKit/Tools/Scripts/print-test-ordering
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
diff --git a/third_party/WebKit/Tools/Scripts/read-checksum-from-png b/third_party/WebKit/Tools/Scripts/read-checksum-from-png
index fb03f28b7e1bc1..8a6859f902eda7 100755
--- a/third_party/WebKit/Tools/Scripts/read-checksum-from-png
+++ b/third_party/WebKit/Tools/Scripts/read-checksum-from-png
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/run-bindings-tests b/third_party/WebKit/Tools/Scripts/run-bindings-tests
index 2bcafb883a30db..d58eb822e818d9 100755
--- a/third_party/WebKit/Tools/Scripts/run-bindings-tests
+++ b/third_party/WebKit/Tools/Scripts/run-bindings-tests
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 # Copyright (C) 2010 Google Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/run-blink-httpd b/third_party/WebKit/Tools/Scripts/run-blink-httpd
index 7d7701b101a05b..86d673350fb4ff 100755
--- a/third_party/WebKit/Tools/Scripts/run-blink-httpd
+++ b/third_party/WebKit/Tools/Scripts/run-blink-httpd
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/run-blink-websocketserver b/third_party/WebKit/Tools/Scripts/run-blink-websocketserver
index 5534fc3abdff1e..974a2ade0669a3 100755
--- a/third_party/WebKit/Tools/Scripts/run-blink-websocketserver
+++ b/third_party/WebKit/Tools/Scripts/run-blink-websocketserver
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/run-blink-wptserve b/third_party/WebKit/Tools/Scripts/run-blink-wptserve
index f13952e2830643..049d64ab966a3e 100755
--- a/third_party/WebKit/Tools/Scripts/run-blink-wptserve
+++ b/third_party/WebKit/Tools/Scripts/run-blink-wptserve
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2015 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.
diff --git a/third_party/WebKit/Tools/Scripts/run-inspector-tests b/third_party/WebKit/Tools/Scripts/run-inspector-tests
index 1fb4d719513b20..62be761c3edd33 100755
--- a/third_party/WebKit/Tools/Scripts/run-inspector-tests
+++ b/third_party/WebKit/Tools/Scripts/run-inspector-tests
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2016 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.
diff --git a/third_party/WebKit/Tools/Scripts/run-perf-tests b/third_party/WebKit/Tools/Scripts/run-perf-tests
index 1bf8ec8627025e..667af3e4f92090 100755
--- a/third_party/WebKit/Tools/Scripts/run-perf-tests
+++ b/third_party/WebKit/Tools/Scripts/run-perf-tests
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/run-webkit-tests b/third_party/WebKit/Tools/Scripts/run-webkit-tests
index 4d6826e8f09ebf..f6bf1b51cc4cb9 100755
--- a/third_party/WebKit/Tools/Scripts/run-webkit-tests
+++ b/third_party/WebKit/Tools/Scripts/run-webkit-tests
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/third_party/WebKit/Tools/Scripts/test-webkitpy b/third_party/WebKit/Tools/Scripts/test-webkitpy
index 4edba769057649..292e3b2884aff3 100755
--- a/third_party/WebKit/Tools/Scripts/test-webkitpy
+++ b/third_party/WebKit/Tools/Scripts/test-webkitpy
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2011 Google Inc. All rights reserved.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
diff --git a/third_party/WebKit/Tools/Scripts/update-flaky-expectations b/third_party/WebKit/Tools/Scripts/update-flaky-expectations
index bc807d0fd93e69..a7c6d48519f398 100755
--- a/third_party/WebKit/Tools/Scripts/update-flaky-expectations
+++ b/third_party/WebKit/Tools/Scripts/update-flaky-expectations
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 #
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/third_party/WebKit/Tools/Scripts/webkit-patch b/third_party/WebKit/Tools/Scripts/webkit-patch
index f16637ceb0d0bf..af68cd0ce1e3a9 100755
--- a/third_party/WebKit/Tools/Scripts/webkit-patch
+++ b/third_party/WebKit/Tools/Scripts/webkit-patch
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2011 Code Aurora Forum. All rights reserved.
 # Copyright (c) 2010 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
diff --git a/third_party/WebKit/Tools/Scripts/wpt-export b/third_party/WebKit/Tools/Scripts/wpt-export
index f2057d31d30c85..53e94c459ad7bd 100755
--- a/third_party/WebKit/Tools/Scripts/wpt-export
+++ b/third_party/WebKit/Tools/Scripts/wpt-export
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2017 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.
diff --git a/third_party/WebKit/Tools/Scripts/wpt-import b/third_party/WebKit/Tools/Scripts/wpt-import
index f8b1d5da14e897..e90d8c6d82b807 100755
--- a/third_party/WebKit/Tools/Scripts/wpt-import
+++ b/third_party/WebKit/Tools/Scripts/wpt-import
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env vpython
 # Copyright 2014 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.
diff --git a/third_party/WebKit/Tools/Scripts/wpt-update-expectations b/third_party/WebKit/Tools/Scripts/wpt-update-expectations
index 82c054817af657..a3e7660b703678 100755
--- a/third_party/WebKit/Tools/Scripts/wpt-update-expectations
+++ b/third_party/WebKit/Tools/Scripts/wpt-update-expectations
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2016 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.