diff options
| author | ilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 04:00:27 +0000 |
|---|---|---|
| committer | ilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 04:00:27 +0000 |
| commit | 94a673c217e70031cbeee9d0bdcc5fb1124419f7 (patch) | |
| tree | d02f273cab6e3bc486276af0a6949253fbb23fd2 /build/android | |
| parent | f95426ccf16a8886afa72a71e77c24305f77fd72 (diff) | |
| download | chromium_src-94a673c217e70031cbeee9d0bdcc5fb1124419f7.zip chromium_src-94a673c217e70031cbeee9d0bdcc5fb1124419f7.tar.gz chromium_src-94a673c217e70031cbeee9d0bdcc5fb1124419f7.tar.bz2 | |
Fix more ninja issues
- single bracket tests fail when variable is empty
- compiler_proxy zombies are causing memory leaks
TBR=yfriedman@chromium.org,nileshagrawal1@chromium.org,cmp@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/10911140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/buildbot/buildbot_functions.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh index 1cf31db..33ab236 100755 --- a/build/android/buildbot/buildbot_functions.sh +++ b/build/android/buildbot/buildbot_functions.sh @@ -65,7 +65,7 @@ function bb_baseline_setup { export GOMA_DIR=/b/build/goma local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool) - if [ $BUILDTOOL = "ninja" ]; then + if [[ $BUILDTOOL = ninja ]]; then export GYP_GENERATORS=ninja fi @@ -94,6 +94,10 @@ function bb_setup_goma_internal { export GOMA_COMPILER_PROXY_DAEMON_MODE=true export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300 + echo "Killing old goma processes" + ${GOMA_DIR}/goma_ctl.sh stop || true + killall compiler_proxy || true + echo "Starting goma" ${GOMA_DIR}/goma_ctl.sh ensure_start trap bb_stop_goma_internal SIGHUP SIGINT SIGTERM @@ -158,7 +162,7 @@ function bb_compile { bb_setup_goma_internal BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool) - if [ $BUILDTOOL = "ninja" ]; then + if [[ $BUILDTOOL = ninja ]]; then bb_goma_ninja All else bb_goma_make @@ -174,7 +178,7 @@ function bb_compile_experimental { for target in ${EXPERIMENTAL_TARGETS} ; do echo "@@@BUILD_STEP Experimental Compile $target @@@" set +e - if [ $BUILDTOOL = "ninja" ]; then + if [[ $BUILDTOOL = ninja ]]; then bb_goma_ninja "${target}" else bb_goma_make -k "${target}" |