[Xen-devel,OSSTEST,16/17] mfi-common: onetoolstack does not vary for a given $xenbranch

Message ID 1390384501-20552-16-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell Jan. 22, 2014, 9:55 a.m.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 mfi-common | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Patch

diff --git a/mfi-common b/mfi-common
index 5529979..60802ef 100644
--- a/mfi-common
+++ b/mfi-common
@@ -225,6 +225,14 @@  job_create_test () {
 # Provides various convenience variables for the callback.
 #
 test_matrix_iterate () {
+
+  case "$xenbranch" in
+  xen-3.*-testing)      onetoolstack=xend ;;
+  xen-4.0-testing)      onetoolstack=xend ;;
+  xen-4.1-testing)      onetoolstack=xend ;;
+  *)                    onetoolstack=xl ;;
+  esac
+
   for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
 
     if [ "x$xenarch" = xdisable ]; then continue; fi
@@ -267,13 +275,6 @@  test_matrix_iterate () {
         suite_runvars=
     fi
 
-    case "$xenbranch" in
-    xen-3.*-testing)      onetoolstack=xend ;;
-    xen-4.0-testing)      onetoolstack=xend ;;
-    xen-4.1-testing)      onetoolstack=xend ;;
-    *)                    onetoolstack=xl ;;
-    esac
-
     for kern in ''; do
 
       case $kern in