From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 1/2] cr-daily-branch: Begin to support other reasons for forcing a baseline. Date: Mon, 13 Jul 2015 09:16:31 +0100 Message-ID: <1436775392-14815-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org By converting the current boolean $force_baseline into a keyword indicating the reason. Signed-off-by: Ian Campbell --- cr-daily-branch | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cr-daily-branch b/cr-daily-branch index 34b6d2b..7e3e69e 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -47,7 +47,7 @@ determine_version () { local tversionvar=$1 local tbranch=$2 local treevarwhich=$3 - if [ "x$tbranch" = "x$branch" ] && ! $force_baseline; then + if [ "x$tbranch" = "x$branch" ] && [ "x$force_baseline" = x ]; then if [ "x$FORCE_REVISION" != x ]; then tversion="$FORCE_REVISION" else @@ -70,7 +70,7 @@ fetch_version () { treeurl=`./ap-print-url $branch` -force_baseline=false +force_baseline='' # Non-empty = indication why we are forcing baseline. skipidentical=true wantpush=$OSSTEST_PUSH @@ -91,7 +91,7 @@ if [ "x$OSSTEST_NO_BASELINE" != xy ] ; then if [ "x$testedflight" = x ]; then wantpush=false skipidentical=false - force_baseline=true + force_baseline='untested' if [ "x$treeurl" != xnone: ]; then treearg=--tree-$tree=$treeurl fi @@ -248,7 +248,8 @@ heading=tmp/$flight.heading-info : >$heading sgr_args+=" --info-headers --include-begin=$heading" -if $force_baseline; then +case "$force_baseline" in + untested) subject_prefix="[$branch baseline test] " cat >>$heading <