Skip to content

Commit d31c589

Browse files
committed
Tweaked mergedevbranch to use bin/count
- Legacy-Id: 13516
1 parent 2e20d9d commit d31c589

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

bin/mergedevbranch

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,13 @@ G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1)
193193
##cd -
194194
195195
echo -e "\nRunning tests"
196-
time ietf/manage.py test --settings=settings_sqlitetest || die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"
196+
time { ietf/manage.py test --settings=settings_sqlitetest \
197+
|| die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"; } 3>&1 1>&2 2>&3 | bin/count
197198
echo ""
198199
200+
read -p "Continue with email sending? [Y/n] "
201+
[ "$REPLY" = "Y" -o "$REPLY" = "y" -o "$REPLY" = "" ] || exit
202+
199203
note "Sending email to changeset author: <$who>"
200204
mail -s "Merged datatracker branch personal/$branch@$rev to trunk" $who -c henrik@levkowetz.com <<-EOF
201205
Hi,

0 commit comments

Comments
 (0)