Flight restriction: Move $maxflight to Osstest::Executive

We are going to move the interpretation of --max-flight into
Osstest::Executive.  Start this by making $maxflight shared between
Executive and the main program.  Later, we will make it no longer
exported.

There are a number of places in Executive where a `my' variable
$maxflight shadows the newly moved global.  These will be got rid of
later, too.

No functional change.

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

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index ecd38c3654b18427c9b319647b838ceae21cf767..ec41ca14e4f8d60fe360375bde9fb2642f75627b 100644 (file)
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -46,6 +46,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(get_harness_rev grabrepolock_reexec
                       findtask @all_lock_tables
+                      $maxflight
                       report_run_getinfo report_altcolour
                       report_blessingscond report_find_push_age_info
                       tcpconnect_queuedaemon plan_search
@@ -193,6 +194,8 @@ sub opendb ($) {
 
 #---------- history reporting ----------
 
+our $maxflight;
+
 our $green=  '#008800';
 our $red=    '#ff8888';
 our $yellow= '#ffff00';

diff --git a/sg-report-flight b/sg-report-flight
index e6ca38c4ffc8900d1beca885f9e9e5fe2c11db18..018e8e2fb771ff1d37f7271e8225b116e044db2d 100755 (executable)
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -45,8 +45,6 @@ our (@includebeginfiles,@includefiles);
 open DEBUG, ">/dev/null";
 open MRO, ">/dev/null";
 
-our $maxflight;
-
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_= shift @ARGV;
     last if m/^--?$/;

diff --git a/sg-report-host-history b/sg-report-host-history
index 8e0e2aa6472c7729954ca97f7a121eaf8ad14fc0..be51483d4cbb64effd1fc1624f87c19025060708 100755 (executable)
--- a/sg-report-host-history
+++ b/sg-report-host-history
@@ -31,7 +31,6 @@ our $limit= 200;
 our $flightlimit;
 our $htmlout = ".";
 our @blessings;
-our $maxflight;
 
 open DEBUG, ">/dev/null";
 

diff --git a/sg-report-job-history b/sg-report-job-history
index e20c376c361100e4e4b9a8f7e676a71267d5f696..358c9498bb7a36d0cc4e04fe366a4201c1d53c5b 100755 (executable)
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -29,7 +29,6 @@ use Osstest::Executive;
 our (@blessings,@branches);
 our $limit= 100;
 our $htmlout;
-our $maxflight;
 our $flight;
 our $job;