[Xen-devel] [OSSTEST PATCH 56/62] platforms: Pass suite to get_arch_platforms

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

The available platforms may depend on the suite to be used.

For now we use $defsuite from make-flight, which is not entirely right
but it will do for now because we don't use other suites much.

No functional change yet since neither implementation uses it.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Osstest/HostDB/Executive.pm | 4 ++--
 Osstest/HostDB/Static.pm    | 4 ++--
 cri-getplatforms            | 2 +-
 make-flight                 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm
index d42250f6..bf6ec57d 100644
--- a/Osstest/HostDB/Executive.pm
+++ b/Osstest/HostDB/Executive.pm
@@ -90,8 +90,8 @@ END
     return $flags;
 }
 
-sub get_arch_platforms ($$) {
-    my ($hd, $blessing, $arch) = @_;
+sub get_arch_platforms ($$$) {
+    my ($hd, $blessing, $arch, $suite) = @_;
 
     my @plats = ( );
     my $platsq = $dbh_tests->prepare(<<END);
diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm
index ab9542dd..0c6be3ee 100644
--- a/Osstest/HostDB/Static.pm
+++ b/Osstest/HostDB/Static.pm
@@ -72,8 +72,8 @@ sub get_flags ($$) { #method
     return $flags;
 }
 
-sub get_arch_platforms ($$) {
-    my ($hd, $blessing, $arch) = @_;
+sub get_arch_platforms ($$$) {
+    my ($hd, $blessing, $arch, $suite) = @_;
 
     my $prop = "Platforms".ucfirst($arch);
 
diff --git a/cri-getplatforms b/cri-getplatforms
index 2bf13483..2b8cee0b 100755
--- a/cri-getplatforms
+++ b/cri-getplatforms
@@ -20,6 +20,6 @@ getplatforms () {
         perl -e '
                 use Osstest;
                 csreadconfig();
-                print join " ", $mhostdb->get_arch_platforms("'$blessing'", 
"'$1'") or die $!;
+                print join " ", $mhostdb->get_arch_platforms("'$blessing'", 
"'$1'", "'$2'") or die $!;
         '
 }
diff --git a/make-flight b/make-flight
index 1e3ebd5c..92dacb35 100755
--- a/make-flight
+++ b/make-flight
@@ -27,9 +27,9 @@ buildflight=$4
 flight=`./cs-flight-create $blessing $branch`
 
 . ./cri-common
-. ./cri-getplatforms
 . ./ap-common
 . ./mfi-common
+. ./cri-getplatforms
 
 # Older versions of Xen may not build with the current default.  Note
 # that branches older than 4.3 might need something even older than
@@ -612,7 +612,7 @@ do_pv_debian_tests () {
 
   for xsm in $xsms ; do
     # Basic PV Linux test with xl
-    for platform in '' `getplatforms $xenarch` ; do
+    for platform in '' `getplatforms $xenarch $defsuite` ; do
 
       # xsm test is not platform specific
       if [ x$xsm = xtrue -a x$platform != x ]; then
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel