Revert 220853 "Revert 220846 "Make landmines.py take an extra sc..."

r220846 was not the root cause of the failure.

> Revert 220846 "Make landmines.py take an extra script via an env..."
> 
> It broke telemetry_unittests.
> http://build.chromium.org/p/chromium.win/builders/Win%207%20Tests%20x64%20%283%29/builds/8782/steps/telemetry_unittests/logs/stdio
> 
> E:\b\depot_tools\python_bin\python_slave.exe src\tools\telemetry\run_tests --browser=release_x64
> No adb found in $PATH, fallback to checked in binary.
> Traceback (most recent call last):
>   File "src\tools\telemetry\run_tests", line 8, in <module>
>     from telemetry.unittest import gtest_testrunner
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\__init__.py", line 12, in <module>
>     from telemetry.core.browser_options import BrowserFinderOptions
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\browser_options.py", line 12, in <module>
>     from telemetry.core import browser_finder
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\browser_finder.py", line 9, in <module>
>     from telemetry.core.backends.chrome import android_browser_finder
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\backends\chrome\android_browser_finder.py", line 17, in <module>
>     from telemetry.core.backends.chrome import android_browser_backend
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\backends\chrome\android_browser_backend.py", line 15, in <module>
>     from telemetry.core.backends.chrome import chrome_browser_backend
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\backends\chrome\chrome_browser_backend.py", line 19, in <module>
>     from telemetry.core.backends.chrome import extension_dict_backend
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\backends\chrome\extension_dict_backend.py", line 9, in <module>
>     from telemetry.core.backends.chrome import inspector_backend
>   File "E:\b\build\slave\Win_7_Tests_x64__3_\build\src\tools\telemetry\telemetry\core\backends\chrome\inspector_backend.py", line 19, in <module>
>     from telemetry.core.jsheap import model
> ImportError: No module named jsheap
> 
> > Make landmines.py take an extra script via an env var.
> > 
> > The extra Python script to run can be specified via env var
> > EXTRA_LANDMINES_SCRIPT.
> > 
> > BUG=223636
> > 
> > Review URL: https://chromiumcodereview.appspot.com/23604016
> 
> TBR=sivachandra@chromium.org
> 
> Review URL: https://codereview.chromium.org/23533016

TBR=tkent@chromium.org

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

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

1 files changed, 14 insertions, 3 deletions

diff --git a/build/landmines.py b/build/landmines.py
index f1a514c..91b4fa9 100755
--- a/build/landmines.py
+++ b/build/landmines.py
@@ -83,13 +83,15 @@ def set_up_landmines(target, new_landmines):
       os.remove(triggered)
 
 
-def main():
+def process_options():
+  """Returns a list of landmine emitting scripts."""
   parser = optparse.OptionParser()
   parser.add_option(
       '-s', '--landmine-scripts', action='append',
       default=[os.path.join(SRC_DIR, 'build', 'get_landmines.py')],
       help='Path to the script which emits landmines to stdout. The target '
-           'is passed to this script via option -t.')
+           'is passed to this script via option -t. Note that an extra '
+           'script can be specified via an env var EXTRA_LANDMINES_SCRIPT.')
   parser.add_option('-v', '--verbose', action='store_true',
       default=('LANDMINES_VERBOSE' in os.environ),
       help=('Emit some extra debugging information (default off). This option '
@@ -104,11 +106,20 @@ def main():
   logging.basicConfig(
       level=logging.DEBUG if options.verbose else logging.ERROR)
 
+  extra_script = os.environ.get('EXTRA_LANDMINES_SCRIPT')
+  if extra_script:
+    return options.landmine_scripts + [extra_script]
+  else:
+    return options.landmine_scripts
+
+
+def main():
+  landmine_scripts = process_options()
   gyp_helper.apply_chromium_gyp_env()
 
   for target in ('Debug', 'Release', 'Debug_x64', 'Release_x64'):
     landmines = []
-    for s in options.landmine_scripts:
+    for s in landmine_scripts:
       proc = subprocess.Popen([sys.executable, s, '-t', target],
                               stdout=subprocess.PIPE)
       output, _ = proc.communicate()