make-flight, mfi-common: rename onetoolstack to pairtoolstack

The name "onetoolstack" in confusing. Currently it's in fact referring
to the toolstack used to test pair migration, so rename it to
"pairtoolstack".

No functional changes introduced.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/make-flight b/make-flight
index df0affe570e2d4e25d51bee442ca27314fd574b8..16be11451312ce6cc1c57a5b85c0e9713c4f7da1 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -527,7 +527,7 @@ test_matrix_do_one () {
 
   # Test live migration
   job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
-            $onetoolstack $xenarch $dom0arch \
+            $pairtoolstack $xenarch $dom0arch \
             !host !host_hostflags \
             $debian_runvars \
             all_hostflags=$most_hostflags,equiv-1

diff --git a/mfi-common b/mfi-common
index 23f8015690a7829e909547513e2d0a1ae18c675e..fb2aedc0fe5d07f491f418e56131cbb2ebf81461 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -322,10 +322,10 @@ job_create_test () {
 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 ;;
+  xen-3.*-testing)      pairtoolstack=xend ;;
+  xen-4.0-testing)      pairtoolstack=xend ;;
+  xen-4.1-testing)      pairtoolstack=xend ;;
+  *)                    pairtoolstack=xl ;;
   esac
 
   for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do