[Android] Fix gtest test scripts for non-default CHROMIUM_OUT_DIR.

build/android/pylib/gtest/setup.py

 # Copyright 2013 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.
 
 """Generates test runner factory and tests for GTests."""
 # pylint: disable=W0212
 
 import fnmatch
 import glob
 import logging
@@ skipping 144 matching lines @@
       if os.path.isdir(p):
         shutil.rmtree(p)
       else:
         os.remove(p)
   finally:
     os.chdir(old_cwd)
 
   # On Android, all pak files need to be in the top-level 'paks' directory.
   paks_dir = os.path.join(constants.ISOLATE_DEPS_DIR, 'paks')
   os.mkdir(paks_dir)
-  for root, _, filenames in os.walk(os.path.join(constants.ISOLATE_DEPS_DIR,
-                                                 'out')):
+
+  deps_out_dir = os.path.join(
+      constants.ISOLATE_DEPS_DIR, os.environ.get('CHROMIUM_OUT_DIR', 'out'))

[frankf, 2014/03/05 01:33:59]

You're duplicating constants.GetOutDirectory(). Also what happened to patch to
get rid of this env var?

[jbudorick, 2014/03/07 07:15:28]

I tried constants.GetOutDirectory() at first because I thought the same thing.
Unfortunately, that appends the build type to the end of CHROMIUM_OUT_DIR --
e.g., it would return 'out/Debug', while this has to be 'out'.

I don't think I ever posted a patch to get rid of this environment variable,
though I did play around with the idea locally. You suggested it in
https://codereview.chromium.org/144093008

[frankf, 2014/03/10 17:35:34]

Why can't we do os.path.join(constants.GetOutDirectory(), os.pardir)

On 2014/03/07 07:15:28, jbudorick wrote:

[jbudorick, 2014/03/11 14:25:09]

We can, and I'm ok with doing so, but how is that any better?

[frankf, 2014/03/11 16:27:34]

It's DRY. Also you're encapsulating how the path is obtained.

On 2014/03/11 14:25:09, jbudorick wrote:

+  for root, _, filenames in os.walk(deps_out_dir):
     for filename in fnmatch.filter(filenames, '*.pak'):
       shutil.move(os.path.join(root, filename), paks_dir)
 
   # Move everything in PRODUCT_DIR to top level.
-  deps_product_dir = os.path.join(constants.ISOLATE_DEPS_DIR, 'out',
-      constants.GetBuildType())
+  deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType())
   if os.path.isdir(deps_product_dir):
     for p in os.listdir(deps_product_dir):
       shutil.move(os.path.join(deps_product_dir, p), constants.ISOLATE_DEPS_DIR)
     os.rmdir(deps_product_dir)
-    os.rmdir(os.path.join(constants.ISOLATE_DEPS_DIR, 'out'))
+    os.rmdir(deps_out_dir)
 
 
 def _GetDisabledTestsFilterFromFile(suite_name):
   """Returns a gtest filter based on the *_disabled file.
 
   Args:
     suite_name: Name of the test suite (e.g. base_unittests).
 
   Returns:
     A gtest filter which excludes disabled tests.
@@ skipping 128 matching lines @@
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
     num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)