
import os
import string
import subprocess
import sys

import utils


def Main():
  args = sys.argv[1:]
  tools_dir = os.path.dirname(os.path.realpath(__file__))
  dart_script_name = 'test.dart'
  dart_test_script = string.join([tools_dir, dart_script_name], os.sep)
  command = [utils.CheckedInSdkExecutable(),
             '--checked', dart_test_script] + args
  exit_code = subprocess.call(command)
  utils.DiagnoseExitCode(exit_code, command)
  return exit_code


if __name__ == '__main__':
  sys.exit(Main())


import os
import string
import subprocess
import sys

import utils


def Main():
  args = sys.argv[1:]
  tools_dir = os.path.dirname(os.path.realpath(__file__))
  dart_script_name = 'test.dart'
  dart_test_script = string.join([tools_dir, dart_script_name], os.sep)
  command = [utils.CheckedInSdkExecutable(),
             '--checked', dart_test_script] + args

  # The testing script potentially needs the android platform tools in PATH so
  # we do that in ./tools/test.py (a similar logic exists in ./tools/build.py).
  android_platform_tools = os.path.normpath(os.path.join(
      tools_dir,
      '../third_party/android_tools/sdk/platform-tools'))
  if os.path.isdir(android_platform_tools):
    os.environ['PATH'] = '%s%s%s' % (
            os.environ['PATH'], os.pathsep, android_platform_tools)

  exit_code = subprocess.call(command)
  utils.DiagnoseExitCode(exit_code, command)
  return exit_code


if __name__ == '__main__':
  sys.exit(Main())

Add third_party/android_tools/sdk/platform-tools to PATH if available
Add third_party/android_tools/sdk/platform-tools to PATH if available

R=whesse@google.com

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

  
  import os
  import string
  import subprocess
  import sys
  
  import utils
  
  
  def Main():
    args = sys.argv[1:]
    tools_dir = os.path.dirname(os.path.realpath(__file__))
    dart_script_name = 'test.dart'
    dart_test_script = string.join([tools_dir, dart_script_name], os.sep)
    command = [utils.CheckedInSdkExecutable(),
               '--checked', dart_test_script] + args
+ 
+   # The testing script potentially needs the android platform tools in PATH so
+   # we do that in ./tools/test.py (a similar logic exists in ./tools/build.py).
+   android_platform_tools = os.path.normpath(os.path.join(
+       tools_dir,
+       '../third_party/android_tools/sdk/platform-tools'))
+   if os.path.isdir(android_platform_tools):
+     os.environ['PATH'] = '%s%s%s' % (
+             os.environ['PATH'], os.pathsep, android_platform_tools)
+ 
    exit_code = subprocess.call(command)
    utils.DiagnoseExitCode(exit_code, command)
    return exit_code
  
  
  if __name__ == '__main__':
    sys.exit(Main())
  
Add third_party/android_tools/sdk/platform-tools to PATH if available
## Code Before:

import os
import string
import subprocess
import sys

import utils


def Main():
  args = sys.argv[1:]
  tools_dir = os.path.dirname(os.path.realpath(__file__))
  dart_script_name = 'test.dart'
  dart_test_script = string.join([tools_dir, dart_script_name], os.sep)
  command = [utils.CheckedInSdkExecutable(),
             '--checked', dart_test_script] + args
  exit_code = subprocess.call(command)
  utils.DiagnoseExitCode(exit_code, command)
  return exit_code


if __name__ == '__main__':
  sys.exit(Main())

## Instruction:
Add third_party/android_tools/sdk/platform-tools to PATH if available
## Code After:

import os
import string
import subprocess
import sys

import utils


def Main():
  args = sys.argv[1:]
  tools_dir = os.path.dirname(os.path.realpath(__file__))
  dart_script_name = 'test.dart'
  dart_test_script = string.join([tools_dir, dart_script_name], os.sep)
  command = [utils.CheckedInSdkExecutable(),
             '--checked', dart_test_script] + args

  # The testing script potentially needs the android platform tools in PATH so
  # we do that in ./tools/test.py (a similar logic exists in ./tools/build.py).
  android_platform_tools = os.path.normpath(os.path.join(
      tools_dir,
      '../third_party/android_tools/sdk/platform-tools'))
  if os.path.isdir(android_platform_tools):
    os.environ['PATH'] = '%s%s%s' % (
            os.environ['PATH'], os.pathsep, android_platform_tools)

  exit_code = subprocess.call(command)
  utils.DiagnoseExitCode(exit_code, command)
  return exit_code


if __name__ == '__main__':
  sys.exit(Main())
