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
This commit is contained in:
@ -65,7 +65,7 @@ function bb_baseline_setup {
|
|||||||
export GOMA_DIR=/b/build/goma
|
export GOMA_DIR=/b/build/goma
|
||||||
|
|
||||||
local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
|
local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
|
||||||
if [ $BUILDTOOL = "ninja" ]; then
|
if [[ $BUILDTOOL = ninja ]]; then
|
||||||
export GYP_GENERATORS=ninja
|
export GYP_GENERATORS=ninja
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -94,6 +94,10 @@ function bb_setup_goma_internal {
|
|||||||
export GOMA_COMPILER_PROXY_DAEMON_MODE=true
|
export GOMA_COMPILER_PROXY_DAEMON_MODE=true
|
||||||
export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300
|
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"
|
echo "Starting goma"
|
||||||
${GOMA_DIR}/goma_ctl.sh ensure_start
|
${GOMA_DIR}/goma_ctl.sh ensure_start
|
||||||
trap bb_stop_goma_internal SIGHUP SIGINT SIGTERM
|
trap bb_stop_goma_internal SIGHUP SIGINT SIGTERM
|
||||||
@ -158,7 +162,7 @@ function bb_compile {
|
|||||||
bb_setup_goma_internal
|
bb_setup_goma_internal
|
||||||
|
|
||||||
BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
|
BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
|
||||||
if [ $BUILDTOOL = "ninja" ]; then
|
if [[ $BUILDTOOL = ninja ]]; then
|
||||||
bb_goma_ninja All
|
bb_goma_ninja All
|
||||||
else
|
else
|
||||||
bb_goma_make
|
bb_goma_make
|
||||||
@ -174,7 +178,7 @@ function bb_compile_experimental {
|
|||||||
for target in ${EXPERIMENTAL_TARGETS} ; do
|
for target in ${EXPERIMENTAL_TARGETS} ; do
|
||||||
echo "@@@BUILD_STEP Experimental Compile $target @@@"
|
echo "@@@BUILD_STEP Experimental Compile $target @@@"
|
||||||
set +e
|
set +e
|
||||||
if [ $BUILDTOOL = "ninja" ]; then
|
if [[ $BUILDTOOL = ninja ]]; then
|
||||||
bb_goma_ninja "${target}"
|
bb_goma_ninja "${target}"
|
||||||
else
|
else
|
||||||
bb_goma_make -k "${target}"
|
bb_goma_make -k "${target}"
|
||||||
|
Reference in New Issue
Block a user