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

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>

diff --git a/tests/busybox-hvm b/tests/busybox-hvm
index 51e9e19d72e25ccf7432533b0e51f834f461c73b..fcffdc99a5f4474363260b0f06e80e50235e54ce 100755 (executable)
--- 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 8e8213b54ec797e80cf500e09571d9419b687129..779f14db0efffb940cbeecc7386e836f12e94a7c 100755 (executable)
--- 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 43dc568211885f2a5a6fc49a5b9bc23c067f6a28..258b08bd16f3e1bf4f9555b81e2d4038495c0140 100644 (file)
--- 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 719b78d87c4812fb2065098712c9cdee28b29e8c..fc0ac1d428f9ce33531c7886d345451b612b9781 100644 (file)
--- 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 4994ea904c15635bdd777ebd998d24807b4315f6..26dc4c10b2b43cd097f8ba7b57952575e3d52148 100644 (file)
--- 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 37e288c8748b3a261a3f8cb8a4f71b40e3501050..e34d0be32081c7287f12619f7285096fb56b19f2 100644 (file)
--- 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 2e4ec2a47c85d39efb9b460c8571ef579146a60e..82fa1f13c91ba551c3614d7922fbd3bcedcc1c31 100644 (file)
--- 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 6cf33e0ed6f474e457f393d9befc976aa27f5b79..296b9244d0ce0a526594d4c494541f384d743a48 100644 (file)
--- 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 fab58560ef4381355132a5f6149571a098fb999c..af950f40fd8f4d28597b9434ee164671a1e243c9 100644 (file)
--- 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