From: Nicholas Piggin <[email protected]> Adds a few additional tests that are known to work in CI.
To control overhead, ppc64be is used to test 64k page size, ppc64le is used to test 4k page size. Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Chinmay Rath <[email protected]> --- .gitlab-ci.yml | 19 ++++++++++++++----- powerpc/unittests.cfg | 9 ++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab1be5f4..b28d1eb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,18 +190,21 @@ build-ppc64be: - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - mkdir build - cd build - - ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu- + - ../configure --arch=ppc64 --endian=big --page-size=64k --cross-prefix=powerpc64-linux-gnu- - make -j2 - - ACCEL=tcg ./run_tests.sh + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh atomics + atomics-migration emulator interrupts mmu + pmu rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day selftest-migration selftest-migration-skip + selftest-migration-ci selftest-setup sieve smp @@ -209,10 +212,12 @@ build-ppc64be: spapr_hcall spapr_vpa sprs + sprs-migration timebase timebase-icount | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi + - grep -q PASS results.txt && ! grep -q FAIL results.txt + build-ppc64le: extends: .intree_template @@ -220,16 +225,19 @@ build-ppc64le: - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu- - make -j2 - - ACCEL=tcg ./run_tests.sh + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh atomics + atomics-migration emulator interrupts mmu + pmu rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day selftest-migration selftest-migration-skip + selftest-migration-ci selftest-setup sieve smp @@ -237,10 +245,11 @@ build-ppc64le: spapr_hcall spapr_vpa sprs + sprs-migration timebase timebase-icount | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi + - grep -q PASS results.txt && ! grep -q FAIL results.txt build-riscv32: extends: .outoftree_template diff --git a/powerpc/unittests.cfg b/powerpc/unittests.cfg index 60c73086..62630ead 100644 --- a/powerpc/unittests.cfg +++ b/powerpc/unittests.cfg @@ -24,6 +24,14 @@ file = selftest-migration.elf machine = pseries groups = selftest migration +# make a kvm-only version for CI for now +# TCG accel support with Qemu and distro release used in gitlab CI needs to checked. +[selftest-migration-ci] +file = selftest-migration.elf +machine = pseries +groups = nodefault selftest migration +accel = kvm + [selftest-migration-skip] file = selftest-migration.elf machine = pseries @@ -94,7 +102,6 @@ accel = tcg,thread=single [atomics] file = atomics.elf -smp = 2 [atomics-migration] file = atomics.elf -- 2.53.0
