BuildSupport: make selectbuildhost modify @ARGV

We pass it \@ARGV everywhere now, and it eats the argument (if it
finds one).  This allows build scripts to take extra arguments.

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

diff --git a/Osstest/BuildSupport.pm b/Osstest/BuildSupport.pm
index 6d43cbc331889a05a5744c0f8363aa9df1e12bd3..0938810523199bbddf97f943586515e0963dd52e 100644 (file)
--- a/Osstest/BuildSupport.pm
+++ b/Osstest/BuildSupport.pm
@@ -56,8 +56,9 @@ our ($builddir,$makeflags);
 our ($xendist);
 
 sub selectbuildhost {
-    # pass @ARGV
-    ($whhost) = @_;
+    # pass \@ARGV
+    my ($av) = @_;
+    $whhost = shift @$av;
     $whhost ||= 'host';
     $ho= selecthost($whhost);
 }

diff --git a/ts-kernel-build b/ts-kernel-build
index 984a93514739a282697339e86ef408b07aefaa62..3b48920c6d4edcc9187c7fb773feca820065d289 100755 (executable)
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -22,7 +22,7 @@ use Osstest::TestSupport;
 use Osstest::BuildSupport;
 
 tsreadconfig();
-selectbuildhost(@ARGV);
+selectbuildhost(\@ARGV);
 builddirsprops();
 
 my $archparms = {

diff --git a/ts-libvirt-build b/ts-libvirt-build
index 5f493e4e31075767a27983f69d39225a0d9bdcc0..940c0341e1229640a20e03d09966774cb3271507 100755 (executable)
--- a/ts-libvirt-build
+++ b/ts-libvirt-build
@@ -22,7 +22,7 @@ use Osstest::TestSupport;
 use Osstest::BuildSupport;
 
 tsreadconfig();
-selectbuildhost(@ARGV);
+selectbuildhost(\@ARGV);
 builddirsprops();
 
 sub libvirtd_init ();

diff --git a/ts-rumpuserxen-build b/ts-rumpuserxen-build
index ee2db977098f33b16649dc8b6148221243163e05..a1f31cd7749700cb3ceb26a36a2102caa299e4c7 100755 (executable)
--- a/ts-rumpuserxen-build
+++ b/ts-rumpuserxen-build
@@ -22,7 +22,7 @@ use Osstest::TestSupport;
 use Osstest::BuildSupport;
 
 tsreadconfig();
-selectbuildhost(@ARGV);
+selectbuildhost(\@ARGV);
 builddirsprops();
 
 our %submodmap = qw(nblibs nblibs

diff --git a/ts-xen-build b/ts-xen-build
index 828c2b464ee35339e6627b0396edc8b22e9c31d9..391327335caaa3484122e692d6420071ea3a14c1 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -24,7 +24,7 @@ use Osstest::TestSupport;
 use Osstest::BuildSupport;
 
 tsreadconfig();
-selectbuildhost(@ARGV);
+selectbuildhost(\@ARGV);
 builddirsprops();
     
 sub checkout () {