Enabling asan pnacl toolchain builders.

buildbot/packages.py

 #!/usr/bin/python
 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import os
 import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import pynacl.platform
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 NACL_DIR = os.path.dirname(SCRIPT_DIR)
 BUILD_DIR = os.path.join(NACL_DIR, 'build')
 
 PACKAGE_VERSION_DIR = os.path.join(BUILD_DIR, 'package_version')
 PACKAGE_VERSION_SCRIPT = os.path.join(PACKAGE_VERSION_DIR, 'package_version.py')
 
 
-def UploadPackages(filename, is_try):
+def UploadPackages(filename, is_try, is_sanitizer=False):
   """ Upload packages to Google Storage.
 
   Args:
     filename: File to read package descriptions from.
     is_try: True if the run is for a trybot, False if for a real buildbot.
+    is_sanitizer: True if building with a sanitizer.
   """
   print '@@@BUILD_STEP upload_package_info@@@'
   sys.stdout.flush()
 
+  buildbot_buildername = os.getenv('BUILDBOT_BUILDERNAME', None)
+  if buildbot_buildername is None:
+    print 'Error - could not obtain buildbot builder name'
+    sys.exit(1)
   if not is_try:
     buildbot_revision = os.getenv('BUILDBOT_GOT_REVISION', None)
     if buildbot_revision is None:
       print 'Error - Could not obtain buildbot revision number'
       sys.exit(1)
-    upload_rev = buildbot_revision
+    if is_sanitizer:
+      upload_rev = '%s/%s' % (buildbot_buildername, buildbot_revision)
+    else:
+      upload_rev = buildbot_revision
     upload_args = []
   else:
-    buildbot_buildername = os.getenv('BUILDBOT_BUILDERNAME', None)
-    if buildbot_buildername is None:
-      print 'Error - could not obtain buildbot builder name'
-      sys.exit(1)
     buildbot_buildnumber = os.getenv('BUILDBOT_BUILDNUMBER', None)
     if buildbot_buildnumber is None:
       print 'Error - could not obtain buildbot build number'
       sys.exit(1)
     upload_rev = '%s/%s' % (buildbot_buildername, buildbot_buildnumber)
     upload_args = ['--cloud-bucket', 'nativeclient-trybot/packages']
 
   with open(filename, 'rt') as f:
     for package_file in f.readlines():
       package_file = package_file.strip()
@@ skipping 91 matching lines @@
     ExtractPackages(arguments.packages_file,
                     overlay_packages=arguments.overlay_packages,
                     skip_missing=arguments.skip_missing)
     return 0
 
   print 'Unknown Command:', arguments.command
   return 1
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))