Remove base-* directories from gm expected/actual paths; just use platform names

trunk/tools/submit_try

 #!/usr/bin/python
 
 # Copyright (c) 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.
 
 
 """
 submit_try: Submit a try request.
 
 This is a thin wrapper around the try request utilities in depot_tools which
 adds some validation and supports both git and svn.
 """
 
 
 import httplib
 import json
 import os
 import re
 import subprocess
 import svn
 import sys
 
-
-GLOBAL_VARIABLES = json.loads(svn.Cat('http://skia.googlecode.com/svn/'
-                                      'buildbot/site_config/'
-                                      'global_variables.json'))
-
-
-def GetGlobalVariable(var_name):
-  return GLOBAL_VARIABLES[var_name]['value']
+import buildbot_globals
 
 
 # Alias which can be used to run a try on every builder.
 ALL_BUILDERS = 'all'
 # Alias which can be used to run a try on all compile builders.
 COMPILE_BUILDERS = 'compile'
 # Alias which can be used to run a try on all builders that are run in the CQ.
 CQ_BUILDERS = 'cq'
 # Alias which can be used to specify a regex to choose builders.
 REGEX = 'regex'
 
 ALL_ALIASES = [ALL_BUILDERS, COMPILE_BUILDERS, CQ_BUILDERS, REGEX]
 
 # Contact information for the build master.
-SKIA_BUILD_MASTER_HOST = str(GetGlobalVariable('master_host'))
-SKIA_BUILD_MASTER_PORT = str(GetGlobalVariable('external_port'))
+SKIA_BUILD_MASTER_HOST = str(buildbot_globals.Get('master_host'))
+SKIA_BUILD_MASTER_PORT = str(buildbot_globals.Get('external_port'))
 
 # All try builders have this suffix.
 TRYBOT_SUFFIX = '-Trybot'
 
 # Location of the codereview.settings file in the Skia repo.
 SKIA_URL = 'skia.googlecode.com'
 CODEREVIEW_SETTINGS = '/svn/codereview.settings'
 
 # String for matching the svn url of the try server inside codereview.settings.
 TRYSERVER_SVN_URL = 'TRYSERVER_SVN_URL: '
@@ skipping 240 matching lines @@
 
   # Parse and validate the command-line arguments.
   args = ValidateArgs(sys.argv[1:], trybots=trybots, is_svn=is_svn)
 
   # Submit the try request.
   SubmitTryRequest(args, is_svn=is_svn)
 
 
 if __name__ == '__main__':
   sys.exit(main())