From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 23 Jul 2015 16:57:07 +0000 (+0100)
Subject: Flight restriction: Update sg-report-flight and sg-report-job-history
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8754771244f724add3a7477b2f827c668905ba02;p=osstest.git

Flight restriction: Update sg-report-flight and sg-report-job-history

Use restrictflight_arg in both these functions.  They still use
$maxflight directly, passing it to report_blessingscond; that will
change in a moment.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/sg-report-flight b/sg-report-flight
index 018e8e2..bdfbfb6 100755
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -65,8 +65,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         push @includebeginfiles, $1;
     } elsif (m/^--include=(.*)$/) {
         push @includefiles, $1;
-    } elsif (m/^--max-flight=(\d+)$/) {
-        $maxflight= $1;
+    } elsif (restrictflight_arg($_)) {
+        # Handled by Executive
     } elsif (m/^--allow=(.*)$/) {
         my ($allowfile) = $1;
         if (!open A, '<', $allowfile) {
diff --git a/sg-report-job-history b/sg-report-job-history
index 358c949..ec2776b 100755
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -41,8 +41,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         $$1= $2;
     } elsif (m/^--(limit)\=([1-9]\d*)$/) {
         $$1= $2;
-    } elsif (m/^--max-flight\=([1-9]\d*)$/) {
-	$maxflight= $1;
+    } elsif (restrictflight_arg($_)) {
+	# Handled by Executive
     } elsif (m/^--html-dir=(.*)$/) {
         $htmlout= $1;
     } elsif (m/^--branches?=(.*)$/) {