From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 14 Feb 2013 12:08:40 +0000 (+0000)
Subject: Executive: fixes following merge/reorg
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=40003c33236430d95defe46efe28fc4cf8308844;p=osstest.git

Executive: fixes following merge/reorg
---

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 3a7628f..0e2358f 100644
--- 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 893dc3e..2f8bf1f 100755
--- 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 2252985..ee021b6 100755
--- 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;