summaryrefslogtreecommitdiff
path: root/acov.sh
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2015-08-07 16:18:17 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2015-08-07 20:07:26 +0530
commit1a02f3c70e8dbf97d230266d0709e7570c7b6228 (patch)
tree1b8a90f35130ad530591a353fb18dd6cceff4cfa /acov.sh
parent0126b5b9d01d308bf8d0323cb1bb4fb08a29b542 (diff)
Remove showcommands to reduce verbosity and add support to comment to gerrit
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Diffstat (limited to 'acov.sh')
-rwxr-xr-xacov.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/acov.sh b/acov.sh
index 31261b7..2296f4b 100755
--- a/acov.sh
+++ b/acov.sh
@@ -100,8 +100,9 @@ fi
if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; then
cd `grep -rni $GERRIT_PROJECT\" .repo/local_manifests | grep -Po 'path="\K[^"]*'`
if git pull ssh://git@$GERRIT_HOST/$GERRIT_PROJECT $GERRIT_REFSPEC | grep -q "Automatic merge failed" ; then
- # TODO Fix this
- # ssh -p $GERRIT_PORT ssh://linaro-big-little-switcher-bot@$GERRIT_HOST review -p $GERRIT_PROJECT -m '"Automatic Merge Failed"' --code-review -1 $GERRIT_CHANGE_ID,$GERRIT_PATCHSET_NUMBER
+ rm -rf ~/.ssh/known_hosts
+ ssh-keyscan -t rsa -p 29418 dev-private-review.linaro.org >> ~/.ssh/known_hosts
+ ssh -p $GERRIT_PORT linaro-big-little-switcher-bot@$GERRIT_HOST gerrit review -p $GERRIT_PROJECT -m '"Automatic Merge Failed"' --code-review -1 $GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER
git reset --hard
echo "Error: *** Merge Failed"
exit -1
@@ -134,7 +135,7 @@ lunch aosp_x86_64-eng
out_dir=generic_x86_64
fi
-make ${flags} -j${jcpu_count} dex2oatd dex2oat showcommands
+make ${flags} -j${jcpu_count} dex2oatd dex2oat
for mode in Quick Optimizing
do
sed -i "s/\$(COMPILED_CLASSES_FLAGS)/\$(COMPILED_CLASSES_FLAGS) --compiler-backend=${mode}/g" build/core/dex_preopt_libart_boot.mk