diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:23:54 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:23:54 +0000 |
| commit | 92b6d2da27d304712584af94d743a6f3a00b54c7 (patch) | |
| tree | c68c81a54ba8644af81edc84f7ef4ea173c05dad /build/android | |
| parent | a60208773d64ff1f04bb03fdeb503ec0ba9a0668 (diff) | |
| download | chromium_src-92b6d2da27d304712584af94d743a6f3a00b54c7.zip chromium_src-92b6d2da27d304712584af94d743a6f3a00b54c7.tar.gz chromium_src-92b6d2da27d304712584af94d743a6f3a00b54c7.tar.bz2 | |
Adapt Android buildbot.sh towards an Android trybot.
For now, the trybot will be compile-only to help with reliability.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/8816004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/buildbot.sh | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/build/android/buildbot.sh b/build/android/buildbot.sh index 0513728..4483fd1 100755 --- a/build/android/buildbot.sh +++ b/build/android/buildbot.sh @@ -14,7 +14,22 @@ set -e set -x +# Options in this script. +BUILD_EXPERIMENTAL_TARGETS=1 +RUN_TESTS=1 NEED_CLOBBER=0 +JOBS=4 # make -j"${JOBS}" + +# If we are a trybot, disable experimental targets and tests. We +# eventually want tests on a trybot but emulator launch/restart is not +# reliable enough yet. +# TODO(jrg): when setting up a trybot, make sure to add TRYBOT=1 in +# the environment. +if [ "${TRYBOT:-0}" = 1 ] ; then + echo "Disabling experimental builds and tests since we are a trybot." + BUILD_EXPERIMENTAL_TARGETS=0 + RUN_TESTS=0 +fi echo "@@@BUILD_STEP cd into source root@@@" SRC_ROOT=$(cd "$(dirname $0)/../.."; pwd) @@ -49,22 +64,26 @@ echo "@@@BUILD_STEP android_gyp@@@" android_gyp echo "@@@BUILD_STEP Compile@@@" -make -j4 +make -j${JOBS} -# Linking DumpRenderTree appears to hang forever? -# EXPERIMENTAL_TARGETS="DumpRenderTree webkit_unit_tests" -EXPERIMENTAL_TARGETS="webkit_unit_tests" -for target in ${EXPERIMENTAL_TARGETS} ; do - echo "@@@BUILD_STEP Experimental Compile $target @@@" - set +e - make -j4 "${target}" - if [ $? -ne 0 ] ; then - echo "@@@STEP_WARNINGS@@@" - fi - set -e -done +if [ "${BUILD_EXPERIMENTAL_TARGETS}" = 1 ] ; then + # Linking DumpRenderTree appears to hang forever? + # EXPERIMENTAL_TARGETS="DumpRenderTree webkit_unit_tests" + EXPERIMENTAL_TARGETS="webkit_unit_tests" + for target in ${EXPERIMENTAL_TARGETS} ; do + echo "@@@BUILD_STEP Experimental Compile $target @@@" + set +e + make -j4 "${target}" + if [ $? -ne 0 ] ; then + echo "@@@STEP_WARNINGS@@@" + fi + set -e + done +fi -echo "@@@BUILD_STEP Run Tests@@@" -build/android/run_tests.py -e --xvfb --verbose +if [ "${RUN_TESTS}" = 1 ] ; then + echo "@@@BUILD_STEP Run Tests@@@" + build/android/run_tests.py -e --xvfb --verbose +fi exit 0 |