diff mbox series

[kvm-unit-test,1/5] travis.yml: Re-arrange the test matrix

Message ID 20191113112649.14322-2-thuth@redhat.com (mailing list archive)
State New, archived
Headers show
Series Improvements for the Travis CI | expand

Commit Message

Thomas Huth Nov. 13, 2019, 11:26 a.m. UTC 
We will soon need more control over the individual test matrix
entries, so we should not limit the matrix to "env" sections,
i.e. put the "matrix:" keyword on the top, not the "env:".

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 92 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 36 deletions(-)

Comments

Alex Bennée Nov. 13, 2019, 12:54 p.m. UTC | #1 
Thomas Huth <thuth@redhat.com> writes:

> We will soon need more control over the individual test matrix
> entries, so we should not limit the matrix to "env" sections,
> i.e. put the "matrix:" keyword on the top, not the "env:".
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  .travis.yml | 92 ++++++++++++++++++++++++++++++++---------------------
>  1 file changed, 56 insertions(+), 36 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 6c14953..611bbdc 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -16,44 +16,64 @@ addons:
>        - qemu-system
>  git:
>    submodules: false
> -env:
> -  matrix:
> -    - CONFIG=""
> -      BUILD_DIR="."
> -      TESTS="vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 vmexit_ipi
> +
> +matrix:
> +  include:
> +    - env:
> +      - CONFIG=""
> +      - BUILD_DIR="."
> +      - TESTS="vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 vmexit_ipi
>               vmexit_ple_round_robin vmexit_tscdeadline vmexit_tscdeadline_immed"
> -    - CONFIG=""
> -      BUILD_DIR="x86-builddir"
> -      TESTS="ioapic-split ioapic smptest smptest3 eventinj msr port80 syscall
> +
> +    - env:
> +      - CONFIG=""
> +      - BUILD_DIR="x86-builddir"
> +      - TESTS="ioapic-split ioapic smptest smptest3 eventinj msr port80 syscall
>               tsc rmap_chain umip intel_iommu vmexit_inl_pmtimer vmexit_ipi_halt"
> -    - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
> -      BUILD_DIR="."
> -      TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
> -    - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
> -      BUILD_DIR="arm-buildir"
> -      TESTS="pci-test pmu gicv2-active gicv3-active psci selftest-setup"
> -    - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
> -      BUILD_DIR="."
> -      TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
> -    - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
> -      BUILD_DIR="arm64-buildir"
> -      TESTS="pci-test pmu gicv2-active gicv3-active psci timer selftest-setup"
> -    - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
> -      BUILD_DIR="."
> -      TESTS="spapr_hcall emulator rtas-set-time-of-day"
> -      ACCEL="tcg,cap-htm=off"
> -    - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
> -      BUILD_DIR="ppc64le-buildir"
> -      TESTS="rtas-get-time-of-day rtas-get-time-of-day-base"
> -      ACCEL="tcg,cap-htm=off"
> -    - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
> -      BUILD_DIR="."
> -      TESTS="diag10 diag308"
> -      ACCEL="tcg,firmware=s390x/run"
> -    - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
> -      BUILD_DIR="s390x-builddir"
> -      TESTS="sieve"
> -      ACCEL="tcg,firmware=s390x/run"
> +
> +    - env:
> +      - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
> +      - BUILD_DIR="."
> +      - TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
> +
> +    - env:
> +      - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
> +      - BUILD_DIR="arm-buildir"
> +      - TESTS="pci-test pmu gicv2-active gicv3-active psci selftest-setup"
> +
> +    - env:
> +      - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
> +      - BUILD_DIR="."
> +      - TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
> +
> +    - env:
> +      - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
> +      - BUILD_DIR="arm64-buildir"
> +      - TESTS="pci-test pmu gicv2-active gicv3-active psci timer selftest-setup"
> +
> +    - env:
> +      - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
> +      - BUILD_DIR="."
> +      - TESTS="spapr_hcall emulator rtas-set-time-of-day"
> +      - ACCEL="tcg,cap-htm=off"
> +
> +    - env:
> +      - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
> +      - BUILD_DIR="ppc64le-buildir"
> +      - TESTS="rtas-get-time-of-day rtas-get-time-of-day-base"
> +      - ACCEL="tcg,cap-htm=off"
> +
> +    - env:
> +      - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
> +      - BUILD_DIR="."
> +      - TESTS="diag10 diag308"
> +      - ACCEL="tcg,firmware=s390x/run"
> +
> +    - env:
> +      - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
> +      - BUILD_DIR="s390x-builddir"
> +      - TESTS="sieve"
> +      - ACCEL="tcg,firmware=s390x/run"
>
>  before_script:
>    - mkdir -p $BUILD_DIR && cd $BUILD_DIR


--
Alex Bennée
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index 6c14953..611bbdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,44 +16,64 @@  addons:
       - qemu-system
 git:
   submodules: false
-env:
-  matrix:
-    - CONFIG=""
-      BUILD_DIR="."
-      TESTS="vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 vmexit_ipi
+
+matrix:
+  include:
+    - env:
+      - CONFIG=""
+      - BUILD_DIR="."
+      - TESTS="vmexit_cpuid vmexit_mov_from_cr8 vmexit_mov_to_cr8 vmexit_ipi
              vmexit_ple_round_robin vmexit_tscdeadline vmexit_tscdeadline_immed"
-    - CONFIG=""
-      BUILD_DIR="x86-builddir"
-      TESTS="ioapic-split ioapic smptest smptest3 eventinj msr port80 syscall
+
+    - env:
+      - CONFIG=""
+      - BUILD_DIR="x86-builddir"
+      - TESTS="ioapic-split ioapic smptest smptest3 eventinj msr port80 syscall
              tsc rmap_chain umip intel_iommu vmexit_inl_pmtimer vmexit_ipi_halt"
-    - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
-      BUILD_DIR="."
-      TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
-    - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
-      BUILD_DIR="arm-buildir"
-      TESTS="pci-test pmu gicv2-active gicv3-active psci selftest-setup"
-    - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
-      BUILD_DIR="."
-      TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
-    - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
-      BUILD_DIR="arm64-buildir"
-      TESTS="pci-test pmu gicv2-active gicv3-active psci timer selftest-setup"
-    - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
-      BUILD_DIR="."
-      TESTS="spapr_hcall emulator rtas-set-time-of-day"
-      ACCEL="tcg,cap-htm=off"
-    - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
-      BUILD_DIR="ppc64le-buildir"
-      TESTS="rtas-get-time-of-day rtas-get-time-of-day-base"
-      ACCEL="tcg,cap-htm=off"
-    - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
-      BUILD_DIR="."
-      TESTS="diag10 diag308"
-      ACCEL="tcg,firmware=s390x/run"
-    - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
-      BUILD_DIR="s390x-builddir"
-      TESTS="sieve"
-      ACCEL="tcg,firmware=s390x/run"
+
+    - env:
+      - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
+      - BUILD_DIR="."
+      - TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
+
+    - env:
+      - CONFIG="--arch=arm --cross-prefix=arm-linux-gnueabihf-"
+      - BUILD_DIR="arm-buildir"
+      - TESTS="pci-test pmu gicv2-active gicv3-active psci selftest-setup"
+
+    - env:
+      - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
+      - BUILD_DIR="."
+      - TESTS="selftest-vectors-kernel selftest-vectors-user selftest-smp"
+
+    - env:
+      - CONFIG="--arch=arm64 --cross-prefix=aarch64-linux-gnu-"
+      - BUILD_DIR="arm64-buildir"
+      - TESTS="pci-test pmu gicv2-active gicv3-active psci timer selftest-setup"
+
+    - env:
+      - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
+      - BUILD_DIR="."
+      - TESTS="spapr_hcall emulator rtas-set-time-of-day"
+      - ACCEL="tcg,cap-htm=off"
+
+    - env:
+      - CONFIG="--arch=ppc64 --endian=little --cross-prefix=powerpc64le-linux-gnu-"
+      - BUILD_DIR="ppc64le-buildir"
+      - TESTS="rtas-get-time-of-day rtas-get-time-of-day-base"
+      - ACCEL="tcg,cap-htm=off"
+
+    - env:
+      - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
+      - BUILD_DIR="."
+      - TESTS="diag10 diag308"
+      - ACCEL="tcg,firmware=s390x/run"
+
+    - env:
+      - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
+      - BUILD_DIR="s390x-builddir"
+      - TESTS="sieve"
+      - ACCEL="tcg,firmware=s390x/run"
 
 before_script:
   - mkdir -p $BUILD_DIR && cd $BUILD_DIR