On Mon, Feb 26, 2024 at 08:12:18PM +1000, Nicholas Piggin wrote: > This adds testing for the powernv machine, and adds a gitlab-ci test > group instead of specifying all tests in .gitlab-ci.yml. > > Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx> > --- > .gitlab-ci.yml | 16 ++++++---------- > powerpc/unittests.cfg | 15 ++++++++------- > 2 files changed, 14 insertions(+), 17 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 61f196d5d..51a593021 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -69,11 +69,9 @@ build-ppc64be: > - cd build > - ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu- > - make -j2 > - - ACCEL=tcg ./run_tests.sh > - selftest-setup selftest-migration selftest-migration-skip spapr_hcall > - rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day > - emulator > - | tee results.txt > + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci | tee results.txt > + - if grep -q FAIL results.txt ; then exit 1 ; fi > + - ACCEL=tcg MAX_SMP=8 MACHINE=powernv ./run_tests.sh -g gitlab-ci | tee results.txt > - if grep -q FAIL results.txt ; then exit 1 ; fi > > build-ppc64le: > @@ -82,11 +80,9 @@ 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 > - selftest-setup selftest-migration selftest-migration-skip spapr_hcall > - rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day > - emulator > - | tee results.txt > + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci | tee results.txt > + - if grep -q FAIL results.txt ; then exit 1 ; fi > + - ACCEL=tcg MAX_SMP=8 MACHINE=powernv ./run_tests.sh -g gitlab-ci | tee results.txt > - if grep -q FAIL results.txt ; then exit 1 ; fi > We're slowly migrating all tests like these to grep -q PASS results.txt && ! grep -q FAIL results.txt Here's a good opportunity to change ppc's. Thanks, drew
