Executive: fixes following merge/reorg

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 3a7628fa82ad31a77ed4f024719178f4a146ed25..0e2358f4a2d69b4282e5a4b679c14230ff0f4e66 100644 (file)
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -19,7 +19,7 @@
 
 export OSSTEST_CONFIG=production-config
 
-check_stop () {
+check_stop_core () {
        if [ "x$OSSTEST_IGNORE_STOP" = xy ]; then return; fi
        for stop_dir in '' $HOME/testing.git/; do
                if test -f $stop_dir${1}stop; then
@@ -27,6 +27,10 @@ check_stop () {
                        exit 0
                fi
        done
+}
+
+check_stop () {
+       check_stop_core "$1"
        if test -f ${1}xsettings; then
                echo "loading ${1}xsettings"
                . ${1}xsettings
@@ -68,7 +72,7 @@ execute_flight () {
         esac
 
         rm -f abort
-        if test -f stop; then return; fi
+        check_stop_core ''
 
         ./cr-ensure-disk-space
 

diff --git a/sg-report-flight b/sg-report-flight
index 893dc3ed6cb5e51fb5404180521a2e6531d2e3c2..2f8bf1fb0c5423550b2711572b8a37dea109f461 100755 (executable)
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -28,6 +28,9 @@ use POSIX;
 use IPC::Open2;
 use Data::Dumper;
 
+use Osstest;
+use Osstest::Executive;
+
 our $specflight;
 our %specver;
 our @blessings;

diff --git a/sg-report-job-history b/sg-report-job-history
index 22529858ddf6739182514dd15a276d9ee9f2e1d1..ee021b688733b06a44edc05a3d031c204101b025 100755 (executable)
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -24,7 +24,8 @@ use Osstest;
 use IO::Handle;
 use HTML::Entities;
 
-our ($job,$flight);
+use Osstest::TestSupport;
+
 our (@blessings,@branches);
 our $limit= 100;
 our $htmlout;