From: Ian Campbell <ian.campbell@citrix.com>
To: ian.jackson@eu.citrix.com
Cc: Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
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 [thread overview]
Message-ID: <1436775392-14815-1-git-send-email-ian.campbell@citrix.com> (raw)
By converting the current boolean $force_baseline into a keyword
indicating the reason.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
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 <<END
"Old" tested version had not actually been tested; therefore in this
@@ -256,7 +257,10 @@ flight we test it, rather than a new candidate. The baseline, if
any, is the most recent actually tested revision.
END
-fi
+ ;;
+ '') # Not forcing a baseline, nothing to say.
+ ;;
+esac
revlog=tmp/$flight.revision-log
--
2.1.4
next reply other threads:[~2015-07-13 8:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 8:16 Ian Campbell [this message]
2015-07-24 17:05 ` [PATCH OSSTEST 1/2] cr-daily-branch: Begin to support other reasons for forcing a baseline Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436775392-14815-1-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).