[Xen-devel] [OSSTEST PATCH 1/6] Move flight_otherjob to Osstest.pm

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Osstest.pm             |    8 ++++++++
 Osstest/TestSupport.pm |    9 +--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Osstest.pm b/Osstest.pm
index bf90153..6535401 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -34,6 +34,7 @@ BEGIN {
                       csreadconfig
                       getmethod
                       postfork
+                      flight_otherjob
                       $dbh_tests db_retry db_retry_retry db_retry_abort
                       db_begin_work db_prepare
                       ensuredir get_filecontents_core_quiet system_checked
@@ -302,6 +303,13 @@ sub csreadconfig () {
 
 #---------- generally useful subroutines ----------
 
+sub flight_otherjob ($$) {
+    my ($thisflight, $otherflightjob) = @_;    
+    return $otherflightjob =~ m/^([^.]+)\.([^.]+)$/ ? ($1,$2) :
+           $otherflightjob =~ m/^\.?([^.]+)$/ ? ($thisflight,$1) :
+           die "$otherflightjob ?";
+}
+
 sub get_filecontents_core_quiet ($) { # ENOENT => undef
     my ($path) = @_;
     if (!open GFC, '<', $path) {
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 699be7e..b5994a4 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -45,7 +45,7 @@ BEGIN {
                       report_once
 
                       store_runvar get_runvar get_runvar_maybe
-                      get_runvar_default need_runvars flight_otherjob
+                      get_runvar_default need_runvars
                       unique_incrementing_runvar next_unique_name
 
                       target_cmd_root target_cmd target_cmd_build
@@ -283,13 +283,6 @@ sub need_runvars {
     die "missing runvars @missing ";
 }
 
-sub flight_otherjob ($$) {
-    my ($thisflight, $otherflightjob) = @_;    
-    return $otherflightjob =~ m/^([^.]+)\.([^.]+)$/ ? ($1,$2) :
-           $otherflightjob =~ m/^\.?([^.]+)$/ ? ($thisflight,$1) :
-           die "$otherflightjob ?";
-}
-
 sub otherflightjob ($) {
     return flight_otherjob($flight,$_[0]);
 }
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel