[3/3] raisin/arm: properly ignore tests that don't work on ARM

Commit Message

Stefano Stabellini May 23, 2017, 9:43 p.m. UTC

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 <[e-mail]>
---
 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(-)

Patch

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