From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 8 Sep 2016 15:33:16 +0000 (+0100)
Subject: Fix test fallout from recent Xen change
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=50d6c6bf4fc04c582b462a809cd778f50f93de15;p=xtf.git

Fix test fallout from recent Xen change

A recent Xen change switched some use of -ENOSYS to -EOPNOTSUPP.  Treat them
equivelently where relevent.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/tests/xsa-167/main.c b/tests/xsa-167/main.c
index 55d6268..893adaf 100644
--- a/tests/xsa-167/main.c
+++ b/tests/xsa-167/main.c
@@ -43,6 +43,7 @@ void test_main(void)
     switch ( rc )
     {
     case -ENOSYS:
+    case -EOPNOTSUPP:
         return xtf_skip("PV superpage support not detected\n");
 
     case -EINVAL:
diff --git a/tests/xsa-188/main.c b/tests/xsa-188/main.c
index 2f15cfd..1d4afbf 100644
--- a/tests/xsa-188/main.c
+++ b/tests/xsa-188/main.c
@@ -41,8 +41,9 @@ void test_main(void)
     expand_array.array_gfn = virt_to_gfn(array_page);
 
     ret = hypercall_event_channel_op(EVTCHNOP_expand_array, &expand_array);
-    if ( ret != -ENOSYS )
-        xtf_failure("EVTCHNOP_expand_array returned %d (!= %d)\n", ret, -ENOSYS);
+    if ( ret != -ENOSYS && ret != -EOPNOTSUPP )
+        xtf_failure("EVTCHNOP_expand_array returned %d (!= %d or %d)\n",
+                    ret, -ENOSYS, -EOPNOTSUPP);
 
     xtf_success(NULL);
 }