Switch Asan bot to builder-tester

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env 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.
 
 import collections
 import copy
 import json
 import optparse
@@ skipping 83 matching lines @@
         ['bb_check_webview_licenses', 'bb_compile', 'bb_run_findbugs',
          'bb_zip_build'], None, None),
       B('main-builder-rel',
         ['bb_compile', 'bb_zip_build'], None, None),
       B('main-clang-builder', compile_step, None, None),
       B('main-clobber', compile_step, None, None),
       B('main-tests', std_test_steps, T(std_tests, [flakiness_server]),
         None),
 
       # Other waterfalls
-      B('asan-builder', std_build_steps, None, None),
-      B('asan-tests', std_test_steps + ['bb_asan_tests_setup'],
+      B('asan-builder-tests', compile_step + ['bb_asan_tests_setup'],
         T(std_tests, ['--asan']), None),
       B('chromedriver-fyi-tests-dbg', std_test_steps, T(['chromedriver']),
         None),
       B('fyi-builder-dbg',
         ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental',
          'bb_run_findbugs', 'bb_zip_build'], None, None),
       B('fyi-builder-rel',
         ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None),
       B('fyi-tests', std_test_steps,
         T(std_tests, ['--experimental', flakiness_server]), None),
@@ skipping 102 matching lines @@
           cwd=CHROME_SRC,
           env=dict(os.environ, BUILDBOT_TESTING='1'))
     else:
       return_code = subprocess.call(command, cwd=CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))