| Index: dart/tools/test.py
 | 
| diff --git a/dart/tools/test.py b/dart/tools/test.py
 | 
| index 51f945d9cf923973ae3b12ce9bebd89f3bc76fef..2dc7279e9b8a7f4156f15d9c33e46785296639dc 100755
 | 
| --- a/dart/tools/test.py
 | 
| +++ b/dart/tools/test.py
 | 
| @@ -9,16 +9,17 @@ import string
 | 
|  import subprocess
 | 
|  import sys
 | 
|  
 | 
| -from utils import GuessOS
 | 
| +import utils
 | 
| +
 | 
|  
 | 
|  def Main():
 | 
|    args = sys.argv[1:]
 | 
|    tools_dir = os.path.dirname(os.path.realpath(__file__))
 | 
|    dart_binary_prefix = os.path.join(tools_dir, 'testing', 'bin')
 | 
| -  if GuessOS() == "win32":
 | 
| +  if utils.IsWindows():
 | 
|      dart_binary = os.path.join(dart_binary_prefix, 'windows', 'dart.exe')
 | 
|    else:
 | 
| -    dart_binary = os.path.join(dart_binary_prefix, GuessOS(), 'dart')
 | 
| +    dart_binary = os.path.join(dart_binary_prefix, utils.GuessOS(), 'dart')
 | 
|    current_directory = os.path.abspath('');
 | 
|    client = os.path.abspath(os.path.join(tools_dir, '..'));
 | 
|    if current_directory == os.path.join(client, 'runtime'):
 | 
| @@ -29,7 +30,10 @@ def Main():
 | 
|      dart_script_name = 'test.dart'
 | 
|    dart_test_script = string.join([tools_dir, dart_script_name], os.sep)
 | 
|    command = [dart_binary, dart_test_script] + args
 | 
| -  return subprocess.call(command)
 | 
| +  exit_code = subprocess.call(command)
 | 
| +  utils.DiagnoseExitCode(exit_code, command)
 | 
| +  return exit_code
 | 
| +
 | 
|  
 | 
|  if __name__ == '__main__':
 | 
|    sys.exit(Main())
 | 
| 
 |