[Xen-devel] [OSSTEST PATCH 6/6] mfi-common: Do not set di_version runvar to empty string

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

Specifically, do not set all_host_di_version to the shell variable
$di_version unless the latter has a nonempty value.  A set but empty
value for all_host_di_version does not default to the version for the
specific suite.  So this produces install failures.

This bug seems to have been introduced fairly recently, as fallout
from recent di_version handling changes.

diffing standalone-generate-dump-flight-runvars shows the expected
changes.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 mfi-common |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mfi-common b/mfi-common
index ab7c5e3..ca1e0dd 100644
--- a/mfi-common
+++ b/mfi-common
@@ -414,7 +414,10 @@ test_matrix_iterate () {
            ;;
     esac
 
-    hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version"
+    hostos_runvars="all_host_suite=$suite"
+    case "$di_version" in
+      ?*) hostos_runvars+=" all_host_di_version=$di_version"
+    esac
 
     for kern in ''; do
 
-- 
1.7.10.4


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