[PATCH OSSTEST v2] cr-daily-branch: Make it possible to suppress the forcing of a baseline test

* [PATCH OSSTEST v2] cr-daily-branch: Make it possible to suppress the forcing of a baseline test
@ 2014-02-10 13:36 Ian Campbell
  2014-02-10 18:14 ` Ian Jackson
  0 siblings, 1 reply; 6+ messages in thread
From: Ian Campbell @ 2014-02-10 13:36 UTC (permalink / raw)
  To: ian.jackson; +Cc: Ian Campbell, xen-devel

This is undesirable (most of the time) in a standalone environment, where you
are mostl ikely to be interested in the current version and not historical
comparissons.

Not sure there isn't a better way.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Remove spurious leading "i" from subject (damn you vi!)
    Use safer test conditional/more obvious syntax
    Remove unneeded call to check_tested as well.
---
 cr-daily-branch | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/cr-daily-branch b/cr-daily-branch
index da6cf2f..c4a0872 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -85,18 +85,20 @@ check_tested () {
 	  "$@"
 }
 
-testedflight=`check_tested --revision-$tree="$OLD_REVISION"`
-
-if [ "x$testedflight" = x ]; then
-        wantpush=false
-        skipidentical=false
-        force_baseline=true
-	if [ "x$treeurl" != xnone: ]; then
-		treearg=--tree-$tree=$treeurl
-	fi
-	tested_revision=`check_tested $treearg --print-revision=$tree`
-	if [ "x$tested_revision" != x ]; then
-		OLD_REVISION="$tested_revision"
+if [ "x$OSSTEST_NO_BASELINE" != xy ] ; then
+	testedflight=`check_tested --revision-$tree="$OLD_REVISION"`
+
+	if [ "x$testedflight" = x ]; then
+		wantpush=false
+		skipidentical=false
+		force_baseline=true
+		if [ "x$treeurl" != xnone: ]; then
+			treearg=--tree-$tree=$treeurl
+		fi
+		tested_revision=`check_tested $treearg --print-revision=$tree`
+		if [ "x$tested_revision" != x ]; then
+			OLD_REVISION="$tested_revision"
+		fi
 	fi
 fi
 
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread