[Android] Fix a few more symlink issues in test_runner.py.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 77 matching lines @@
                      help=('Address of the server that is hosting the '
                            'Chrome for Android flakiness dashboard.'))
   group.add_argument('--enable-platform-mode', action='store_true',
                      help=('Run the test scripts in platform mode, which '
                            'conceptually separates the test runner from the '
                            '"device" (local or remote, real or emulated) on '
                            'which the tests are running. [experimental]'))
   group.add_argument('-e', '--environment', default='local',
                      choices=constants.VALID_ENVIRONMENTS,
                      help='Test environment to run in (default: %(default)s).')
-  group.add_argument('--adb-path', type=os.path.abspath,
+  group.add_argument('--adb-path', type=os.path.realpath,
                      help=('Specify the absolute path of the adb binary that '
                            'should be used.'))
   group.add_argument('--json-results-file', '--test-launcher-summary-output',
-                     dest='json_results_file',
+                     dest='json_results_file', type=os.path.realpath,
                      help='If set, will dump results in JSON form '
                           'to specified file.')
 
   logcat_output_group = group.add_mutually_exclusive_group()
   logcat_output_group.add_argument(
-      '--logcat-output-dir',
+      '--logcat-output-dir', type=os.path.realpath,
       help='If set, will dump logcats recorded during test run to directory. '
            'File names will be the device ids with timestamps.')
   logcat_output_group.add_argument(
-      '--logcat-output-file',
+      '--logcat-output-file', type=os.path.realpath,
       help='If set, will merge logcats recorded during test run and dump them '
            'to the specified file.')
 
   class FastLocalDevAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
       namespace.verbose_count = max(namespace.verbose_count, 1)
       namespace.num_retries = 0
       namespace.enable_device_cache = True
       namespace.enable_concurrent_adb = True
       namespace.skip_clear_data = True
@@ skipping 85 matching lines @@
 def AddDeviceOptions(parser):
   """Adds device options to |parser|."""
   group = parser.add_argument_group(title='Device Options')
   group.add_argument('--tool',
                      dest='tool',
                      help=('Run the test under a tool '
                            '(use --tool help to list them)'))
   group.add_argument('-d', '--device', dest='test_device',
                      help=('Target device for the test suite '
                            'to run on.'))
-  group.add_argument('--blacklist-file', help='Device blacklist file.')
+  group.add_argument('--blacklist-file', type=os.path.realpath,
+                     help='Device blacklist file.')
   group.add_argument('--enable-device-cache', action='store_true',
                      help='Cache device state to disk between runs')
   group.add_argument('--enable-concurrent-adb', action='store_true',
                      help='Run multiple adb commands at the same time, even '
                           'for the same device.')
   group.add_argument('--skip-clear-data', action='store_true',
                      help='Do not wipe app data between tests. Use this to '
                      'speed up local development and never on bots '
                      '(increases flakiness)')
-  group.add_argument('--target-devices-file',
+  group.add_argument('--target-devices-file', type=os.path.realpath,
                      help='Path to file with json list of device serials to '
                           'run tests on. When not specified, all available '
                           'devices are used.')
 
 
 def AddGTestOptions(parser):
   """Adds gtest options to |parser|."""
 
   group = parser.add_argument_group('GTest Options')
   group.add_argument('-s', '--suite', dest='suite_name',
                      nargs='+', metavar='SUITE_NAME', required=True,
                      help='Executable name of the test suite to run.')
-  group.add_argument('--executable-dist-dir',
+  group.add_argument('--executable-dist-dir', type=os.path.realpath,
                      help="Path to executable's dist directory for native"
                           " (non-apk) tests.")
   group.add_argument('--test-apk-incremental-install-script',
+                     type=os.path.realpath,
                      help='Path to install script for the test apk.')
   group.add_argument('--gtest_also_run_disabled_tests',
                      '--gtest-also-run-disabled-tests',
                      dest='run_disabled', action='store_true',
                      help='Also run disabled tests if applicable.')
   group.add_argument('-a', '--test-arguments', dest='test_arguments',
                      default='',
                      help='Additional arguments to pass to the test.')
   group.add_argument('-t', '--shard-timeout',
                      dest='shard_timeout', type=int, default=120,
                      help='Timeout to wait for each test '
                           '(default: %(default)s).')
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
+                     type=os.path.realpath,
                      help='.isolate file path to override the default '
                           'path')
   group.add_argument('--app-data-file', action='append', dest='app_data_files',
                      help='A file path relative to the app data directory '
                           'that should be saved to the host.')
   group.add_argument('--app-data-file-dir',
                      help='Host directory to which app data files will be'
                           ' saved. Used with --app-data-file.')
   group.add_argument('--delete-stale-data', dest='delete_stale_data',
                      action='store_true',
@@ skipping 11 matching lines @@
                           'tests can be determined from it, skip querying the '
                           'device for the list of all tests. Speeds up local '
                           'development, but is not safe to use on bots ('
                           'http://crbug.com/549214')
 
   filter_group = group.add_mutually_exclusive_group()
   filter_group.add_argument('-f', '--gtest_filter', '--gtest-filter',
                             dest='test_filter',
                             help='googletest-style filter string.')
   filter_group.add_argument('--gtest-filter-file', dest='test_filter_file',
+                            type=os.path.realpath,
                             help='Path to file that contains googletest-style '
                                   'filter strings. (Lines will be joined with '
                                   '":" to create a single filter string.)')
 
   AddDeviceOptions(parser)
   AddCommonOptions(parser)
   AddRemoteDeviceOptions(parser)
 
 
 def AddLinkerTestOptions(parser):
@@ skipping 22 matching lines @@
       '-A', '--annotation', dest='annotation_str',
       help=('Comma-separated list of annotations. Run only tests with any of '
             'the given annotations. An annotation can be either a key or a '
             'key-values pair. A test that has no annotation is considered '
             '"SmallTest".'))
   argument_group.add_argument(
       '-E', '--exclude-annotation', dest='exclude_annotation_str',
       help=('Comma-separated list of annotations. Exclude tests with these '
             'annotations.'))
   argument_group.add_argument(
-      '--screenshot-directory', dest='screenshot_dir',
+      '--screenshot-directory', dest='screenshot_dir', type=os.path.realpath,
       help='Capture screenshots of test failures')
   argument_group.add_argument(
       '--save-perf-json', action='store_true',
       help='Saves the JSON file for each UI Perf test.')
   argument_group.add_argument(
       '--official-build', action='store_true', help='Run official build tests.')
   argument_group.add_argument(
       '--disable-dalvik-asserts', dest='set_asserts', action='store_false',
       default=True, help='Removes the dalvik.vm.enableassertions property')
 
@@ skipping 32 matching lines @@
   java_or_python_group.add_argument(
       '-p', '--python-only', action='store_false',
       dest='run_java_tests', default=True,
       help='DEPRECATED')
 
   group.add_argument('--host-driven-root',
                      help='DEPRECATED')
   group.add_argument('-w', '--wait_debugger', dest='wait_for_debugger',
                      action='store_true',
                      help='Wait for debugger.')
+  # TODO(jbudorick): Remove support for name-style APK specification once
+  # bots are no longer doing it.
   group.add_argument('--apk-under-test',
                      help='Path or name of the apk under test.')
   group.add_argument('--apk-under-test-incremental-install-script',
                      help='Path to install script for the --apk-under-test.')
   group.add_argument('--test-apk', required=True,
                      help='Path or name of the apk containing the tests '
                           '(name is without the .apk extension; '
                           'e.g. "ContentShellTest").')
   group.add_argument('--test-apk-incremental-install-script',
+                     type=os.path.realpath,
                      help='Path to install script for the --test-apk.')
   group.add_argument('--additional-apk', action='append',
                      dest='additional_apks', default=[],
+                     type=os.path.realpath,
                      help='Additional apk that must be installed on '
                           'the device when the tests are run')
-  group.add_argument('--coverage-dir',
+  group.add_argument('--coverage-dir', type=os.path.realpath,
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
-  group.add_argument('--device-flags', dest='device_flags', default='',
+  group.add_argument('--device-flags', dest='device_flags',
+                     type=os.path.realpath,
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
-  group.add_argument('--device-flags-file', default='',
+  group.add_argument('--device-flags-file', type=os.path.realpath,
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
+                     type=os.path.realpath,
                      help='.isolate file path to override the default '
                           'path')
   group.add_argument('--delete-stale-data', dest='delete_stale_data',
                      action='store_true',
                      help='Delete stale test data on the device.')
   group.add_argument('--timeout-scale', type=float,
                      help='Factor by which timeouts should be scaled.')
   group.add_argument('--strict-mode', dest='strict_mode', default='testing',
                      help='StrictMode command-line flag set on the device, '
                           'death/testing to kill the process, off to stop '
@@ skipping 25 matching lines @@
   group.add_argument(
       '--package-filter', dest='package_filter',
       help='Filters tests by package.')
   group.add_argument(
       '--runner-filter', dest='runner_filter',
       help='Filters tests by runner class. Must be fully qualified.')
   group.add_argument(
       '--sdk-version', dest='sdk_version', type=int,
       help='The Android SDK version.')
   group.add_argument(
-      '--coverage-dir', dest='coverage_dir',
+      '--coverage-dir', dest='coverage_dir', type=os.path.realpath,
       help='Directory to store coverage info.')
   AddCommonOptions(parser)
 
 
 def AddMonkeyTestOptions(parser):
   """Adds monkey test options to |parser|."""
 
   group = parser.add_argument_group('Monkey Test Options')
   group.add_argument(
       '--package', required=True, choices=constants.PACKAGE_INFO.keys(),
@@ skipping 83 matching lines @@
       help='Execute the given command with retries, but only print the result '
            'for the "most successful" round.')
   step_group.add_argument(
       '--steps',
       help='JSON file containing the list of commands to run.')
   step_group.add_argument(
       '--print-step',
       help='The name of a previously executed perf step to print.')
 
   group.add_argument(
-      '--output-json-list',
+      '--output-json-list', type=os.path.realpath,
       help='Write a simple list of names from --steps into the given file.')
   group.add_argument(
       '--collect-chartjson-data',
       action='store_true',
       help='Cache the chartjson output from each step for later use.')
   group.add_argument(
       '--output-chartjson-data',
       default='',
+      type=os.path.realpath,
       help='Write out chartjson into the given file.')
   # TODO(rnephew): Remove this when everything moves to new option in platform
   # mode.
   group.add_argument(
-      '--get-output-dir-archive', metavar='FILENAME',
+      '--get-output-dir-archive', metavar='FILENAME', type=os.path.realpath,
       help='Write the cached output directory archived by a step into the'
       ' given ZIP file.')
   group.add_argument(
-      '--output-dir-archive-path', metavar='FILENAME',
+      '--output-dir-archive-path', metavar='FILENAME', type=os.path.realpath,
       help='Write the cached output directory archived by a step into the'
       ' given ZIP file.')
   group.add_argument(
-      '--flaky-steps',
+      '--flaky-steps', type=os.path.realpath,
       help=('A JSON file containing steps that are flaky '
             'and will have its exit code ignored.'))
   group.add_argument(
       '--no-timeout', action='store_true',
       help=('Do not impose a timeout. Each perf step is responsible for '
             'implementing the timeout logic.'))
   group.add_argument(
       '-f', '--test-filter',
       help=('Test filter (will match against the names listed in --steps).'))
   group.add_argument(
@@ skipping 346 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())