From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Vignesh Raman <vignesh.raman@collabora.com>
Cc: dri-devel@lists.freedesktop.org, daniels@collabora.com,
helen.koike@collabora.com, airlied@gmail.com, daniel@ffwll.ch,
robdclark@gmail.com, david.heidelberg@collabora.com,
guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com,
mcanal@igalia.com, linux-mediatek@lists.infradead.org,
linux-amlogic@lists.infradead.org,
linux-rockchip@lists.infradead.org,
amd-gfx@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
intel-gfx@lists.freedesktop.org,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1 2/5] drm/ci: generate testlist from build
Date: Tue, 30 Apr 2024 13:17:17 +0300 [thread overview]
Message-ID: <k7sepoksttro3dgxxtwxfmlxwv5w5zn3aeso7p24mm3n74bo45@kx2dpe2qkqgo> (raw)
In-Reply-To: <20240430091121.508099-3-vignesh.raman@collabora.com>
On Tue, Apr 30, 2024 at 02:41:18PM +0530, Vignesh Raman wrote:
> Stop vendoring the testlist into the kernel. Instead, use the
> testlist from the IGT build to ensure we do not miss renamed
> or newly added tests.
>
> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
> ---
> drivers/gpu/drm/ci/build-igt.sh | 23 +
> drivers/gpu/drm/ci/igt_runner.sh | 9 +-
> drivers/gpu/drm/ci/testlist.txt | 2761 ------------------------------
> 3 files changed, 28 insertions(+), 2765 deletions(-)
> delete mode 100644 drivers/gpu/drm/ci/testlist.txt
>
> diff --git a/drivers/gpu/drm/ci/build-igt.sh b/drivers/gpu/drm/ci/build-igt.sh
> index 500fa4f5c30a..cedc62baba1e 100644
> --- a/drivers/gpu/drm/ci/build-igt.sh
> +++ b/drivers/gpu/drm/ci/build-igt.sh
> @@ -26,6 +26,29 @@ meson build $MESON_OPTIONS $EXTRA_MESON_ARGS
> ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
> ninja -C build install
>
> +set +ex
> +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/igt/lib64
> +while read -r line; do
> + if [ "$line" = "TESTLIST" ] || [ "$line" = "END TESTLIST" ]; then
> + continue
> + fi
> +
> + tests=$(echo "$line" | tr ' ' '\n')
> +
> + for test in $tests; do
> + output=$(/igt/libexec/igt-gpu-tools/"$test" --list-subtests)
> +
> + if [ -z "$output" ]; then
> + echo "$test"
> + else
> + echo "$output" | while read -r subtest; do
> + echo "$test@$subtest"
> + done
> + fi
> + done
> +done < /igt/libexec/igt-gpu-tools/test-list.txt > /igt/libexec/igt-gpu-tools/testlist.txt
> +set -ex
Is the list in sync between x86 and arm/arm64 IGT builds? Is there a
chance of having a safety net here?
> +
> mkdir -p artifacts/
> tar -cf artifacts/igt.tar /igt
>
> diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
> index f1a08b9b146f..20026612a9bd 100755
> --- a/drivers/gpu/drm/ci/igt_runner.sh
> +++ b/drivers/gpu/drm/ci/igt_runner.sh
> @@ -59,25 +59,26 @@ fi
>
> curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s ${FDO_HTTP_CACHE_URI:-}$PIPELINE_ARTIFACTS_BASE/$ARCH/igt.tar.gz | tar --zstd -v -x -C /
>
> +TESTLIST="/igt/libexec/igt-gpu-tools/testlist.txt"
>
> # If the job is parallel at the gitab job level, take the corresponding fraction
> # of the caselist.
> if [ -n "$CI_NODE_INDEX" ]; then
> - sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /install/testlist.txt
> + sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" $TESTLIST
> fi
>
> # core_getversion checks if the driver is loaded and probed correctly
> # so run it in all shards
> -if ! grep -q "core_getversion" /install/testlist.txt; then
> +if ! grep -q "core_getversion" $TESTLIST; then
> # Add the line to the file
> - echo "core_getversion" >> /install/testlist.txt
> + echo "core_getversion" >> $TESTLIST
> fi
>
> set +e
> igt-runner \
> run \
> --igt-folder /igt/libexec/igt-gpu-tools \
> - --caselist /install/testlist.txt \
> + --caselist $TESTLIST \
> --output /results \
> $IGT_SKIPS \
> $IGT_FLAKES \
--
With best wishes
Dmitry
next prev parent reply other threads:[~2024-04-30 10:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 9:11 [PATCH v1 0/5] drm/ci: uprev mesa and generate testlist Vignesh Raman
2024-04-30 9:11 ` [PATCH v1 1/5] drm/ci: uprev mesa version Vignesh Raman
2024-04-30 14:30 ` Helen Koike
2024-04-30 9:11 ` [PATCH v1 2/5] drm/ci: generate testlist from build Vignesh Raman
2024-04-30 10:17 ` Dmitry Baryshkov [this message]
2024-05-07 5:46 ` Vignesh Raman
2024-04-30 14:31 ` Helen Koike
2024-05-07 6:00 ` Vignesh Raman
2024-04-30 9:11 ` [PATCH v1 3/5] drm/ci: build virtual GPU driver as module Vignesh Raman
2024-04-30 14:31 ` Helen Koike
2024-04-30 9:11 ` [PATCH v1 4/5] drm/ci: skip driver specific tests Vignesh Raman
2024-04-30 10:09 ` Dmitry Baryshkov
2024-04-30 14:31 ` Helen Koike
2024-05-07 6:05 ` Vignesh Raman
2024-04-30 9:11 ` [PATCH v1 5/5] drm/ci: update xfails for the new testlist Vignesh Raman
2024-04-30 10:15 ` Dmitry Baryshkov
2024-05-07 6:07 ` Vignesh Raman
2024-04-30 14:31 ` Helen Koike
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=k7sepoksttro3dgxxtwxfmlxwv5w5zn3aeso7p24mm3n74bo45@kx2dpe2qkqgo \
--to=dmitry.baryshkov@linaro.org \
--cc=airlied@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel@ffwll.ch \
--cc=daniels@collabora.com \
--cc=david.heidelberg@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=guilherme.gallo@collabora.com \
--cc=helen.koike@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mcanal@igalia.com \
--cc=robdclark@gmail.com \
--cc=sergi.blanch.torne@collabora.com \
--cc=vignesh.raman@collabora.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).