summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 02:15:04 +0000
committerilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 02:15:04 +0000
commit8e7bed1e9d453e808b32c446c58fc29b823ceacd (patch)
tree7787eb59e2c048ab9a545819ec3880b4bf6b68d3
parent2e5dfbc2c5a31a511cde3e5f128afb8df9492b5d (diff)
downloadchromium_src-8e7bed1e9d453e808b32c446c58fc29b823ceacd.zip
chromium_src-8e7bed1e9d453e808b32c446c58fc29b823ceacd.tar.gz
chromium_src-8e7bed1e9d453e808b32c446c58fc29b823ceacd.tar.bz2
Add asan android buildbot scripts
- Also add suppost for asan=1 gyp define, which implicitly sets clang=1. R=yfriedman@chromium.org BUG=160952 NOTRY=True Review URL: https://chromiumcodereview.appspot.com/11308286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170631 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/android/buildbot/bb_asan_builder.sh18
-rwxr-xr-xbuild/android/buildbot/bb_asan_tests.sh21
-rwxr-xr-xbuild/android/buildbot/buildbot_functions.sh2
3 files changed, 40 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_asan_builder.sh b/build/android/buildbot/bb_asan_builder.sh
new file mode 100755
index 0000000..d76598b
--- /dev/null
+++ b/build/android/buildbot/bb_asan_builder.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -ex
+# Copyright (c) 2012 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.
+#
+# Buildbot annotator script for the fyi waterfall and fyi trybots.
+# Compile and zip the build.
+
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
+
+bb_baseline_setup "$BB_SRC_ROOT" "$@"
+bb_check_webview_licenses
+bb_compile
+bb_compile_experimental
+bb_run_findbugs
+bb_zip_build
diff --git a/build/android/buildbot/bb_asan_tests.sh b/build/android/buildbot/bb_asan_tests.sh
new file mode 100755
index 0000000..e50a32b
--- /dev/null
+++ b/build/android/buildbot/bb_asan_tests.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+# Copyright (c) 2012 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.
+#
+# Buildbot annotator script for the fyi waterfall and fyi trybots.
+# Downloads and extracts a build from the builder and runs tests.
+
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
+
+bb_baseline_setup "$BB_SRC_ROOT" "$@"
+bb_spawn_logcat_monitor_and_status
+bb_extract_build
+bb_reboot_phones
+bb_run_unit_tests
+bb_run_instrumentation_tests
+bb_run_experimental_unit_tests
+bb_run_experimental_instrumentation_tests
+bb_print_logcat
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index c0c7579..bf4d085 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -60,7 +60,7 @@ function bb_baseline_setup {
local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \
extra_gyp_defines)"
export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines"
- if echo $extra_gyp_defines | grep -q clang; then
+ if echo $extra_gyp_defines | grep -qE 'clang|asan'; then
unset CXX_target
fi