All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefano Stabellini <sstabellini@kernel.org>
To: george.dunlap@citrix.com
Cc: sstabellini@kernel.org, xen-devel@lists.xensource.com
Subject: [PATCH 3/3] raisin/arm: properly ignore tests that don't work on ARM
Date: Tue, 23 May 2017 14:43:03 -0700	[thread overview]
Message-ID: <1495575783-23675-3-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <1495575783-23675-1-git-send-email-sstabellini@kernel.org>

Ignore all cirros tests on ARM for now. Print a warning for PV tests,
which could work on ARM one day (HVM tests won't work any time soon,
given that there is no HVM builder type on ARM).

Do not exit 0 when we detect ARM in a test: it causes the whole raise to
exit. Return 0 instead.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---
 tests/busybox-hvm                 | 2 +-
 tests/busybox-hvm-migrate         | 2 +-
 tests/cirros-minios-stubdom-hvm   | 5 +++++
 tests/cirros-minios-stubdom-pvhvm | 5 +++++
 tests/cirros-pvgrub2-pv           | 5 +++++
 tests/cirros-pygrub-pv            | 6 ++++++
 tests/cirros-qemu-hvm             | 5 +++++
 tests/cirros-qemu-pvhvm           | 5 +++++
 tests/cirros-separate-kernel-pv   | 6 ++++++
 9 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/tests/busybox-hvm b/tests/busybox-hvm
index 51e9e19..fcffdc9 100755
--- a/tests/busybox-hvm
+++ b/tests/busybox-hvm
@@ -14,7 +14,7 @@ function busybox-hvm-test() {
     if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
     then
         echo $PREPEND busybox hvm test only valid on x86
-        exit 0
+        return 0
     fi
 
     TMPDIR=`mktemp -d`
diff --git a/tests/busybox-hvm-migrate b/tests/busybox-hvm-migrate
index 8e8213b..779f14d 100755
--- a/tests/busybox-hvm-migrate
+++ b/tests/busybox-hvm-migrate
@@ -13,7 +13,7 @@ function busybox-hvm-migrate-test() {
     if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
     then
         echo $PREPEND busybox hvm test only valid on x86
-        exit 0
+        return 0
     fi
 
     busybox-hvm-test
diff --git a/tests/cirros-minios-stubdom-hvm b/tests/cirros-minios-stubdom-hvm
index 43dc568..258b08b 100644
--- a/tests/cirros-minios-stubdom-hvm
+++ b/tests/cirros-minios-stubdom-hvm
@@ -7,6 +7,11 @@ function cirros-minios-stubdom-hvm-cleanup() {
 }
 
 function cirros-minios-stubdom-hvm-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir
diff --git a/tests/cirros-minios-stubdom-pvhvm b/tests/cirros-minios-stubdom-pvhvm
index 719b78d..fc0ac1d 100644
--- a/tests/cirros-minios-stubdom-pvhvm
+++ b/tests/cirros-minios-stubdom-pvhvm
@@ -7,6 +7,11 @@ function cirros-minios-stubdom-pvhvm-cleanup() {
 }
 
 function cirros-minios-stubdom-pvhvm-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir
diff --git a/tests/cirros-pvgrub2-pv b/tests/cirros-pvgrub2-pv
index 4994ea9..26dc4c1 100644
--- a/tests/cirros-pvgrub2-pv
+++ b/tests/cirros-pvgrub2-pv
@@ -7,6 +7,11 @@ function cirros-pvgrub2-pv-cleanup() {
 }
 
 function cirros-pvgrub2-pv-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir
diff --git a/tests/cirros-pygrub-pv b/tests/cirros-pygrub-pv
index 37e288c..e34d0be 100644
--- a/tests/cirros-pygrub-pv
+++ b/tests/cirros-pygrub-pv
@@ -7,6 +7,12 @@ function cirros-pygrub-pv-cleanup() {
 }
 
 function cirros-pygrub-pv-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        echo $PREPEND cirros tests disabled on ARM for now
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir
diff --git a/tests/cirros-qemu-hvm b/tests/cirros-qemu-hvm
index 2e4ec2a..82fa1f1 100644
--- a/tests/cirros-qemu-hvm
+++ b/tests/cirros-qemu-hvm
@@ -7,6 +7,11 @@ function cirros-qemu-hvm-cleanup() {
 }
 
 function cirros-qemu-hvm-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir
diff --git a/tests/cirros-qemu-pvhvm b/tests/cirros-qemu-pvhvm
index 6cf33e0..296b924 100644
--- a/tests/cirros-qemu-pvhvm
+++ b/tests/cirros-qemu-pvhvm
@@ -7,6 +7,11 @@ function cirros-qemu-pvhvm-cleanup() {
 }
 
 function cirros-qemu-pvhvm-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir
diff --git a/tests/cirros-separate-kernel-pv b/tests/cirros-separate-kernel-pv
index fab5856..af950f4 100644
--- a/tests/cirros-separate-kernel-pv
+++ b/tests/cirros-separate-kernel-pv
@@ -7,6 +7,12 @@ function cirros-separate-kernel-pv-cleanup() {
 }
 
 function cirros-separate-kernel-pv-test() {
+    if [[ $RAISIN_ARCH != "x86_64" && $RAISIN_ARCH != "x86_32" ]]
+    then
+        echo $PREPEND cirros tests disabled on ARM for now
+        return 0
+    fi
+
     download_cirros_components
     testdir=`mktemp -d`
     cp $CIRROS_DOWNLOADS/$CIRROS_KERNEL_FILE $testdir
-- 
1.9.1


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

      parent reply	other threads:[~2017-05-23 21:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-23 21:42 [PATCH 0/3] raisin test fixes Stefano Stabellini
2017-05-23 21:43 ` [PATCH 1/3] raisin: introduce TEST_KERNEL and TEST_INITRD Stefano Stabellini
2017-05-23 21:43   ` [PATCH 2/3] raisin: check for invalid initrds Stefano Stabellini
2017-05-23 21:43   ` Stefano Stabellini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495575783-23675-3-git-send-email-sstabellini@kernel.org \
    --to=sstabellini@kernel.org \
    --cc=george.dunlap@citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.