From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C0656BB20; Tue, 7 May 2024 05:46:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715060807; cv=none; b=PdgPJxZkuKTN29O8PlB2ybhDO35V79ZBuWOI9FHlLzTsoDmaqyzmCu9tdMNPwiFw46Owk2PhitQVTffviQNtXdpi8b0b+jf0hW9SKPd/72jBJzEKQVSOwNOtNatcU5TqIkUmIIDrQ+wb03NiuIGGtEBcj8YN85a/xXW6PVnqXZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715060807; c=relaxed/simple; bh=/NxMfXX51LM6wRVaE17ulyFtkVct5TM0jpzpKe/PK9U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=MrkHHrYmtT682O6mdbMY5bFf2hLQbB+JatsMPK47kO8kQUuC/kKWlZ9S+quHcexENezVS9w5mLS8XpzgUIXFvB3mmMdN7OYnepwc52I1Ay1X6JXc26GdDHzg269cLreTB5rjLNNPI5bfqvNirUoRYc49jeFd4ULtDF6XOcOHto0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=FuNCQ0Fc; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="FuNCQ0Fc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1715060797; bh=/NxMfXX51LM6wRVaE17ulyFtkVct5TM0jpzpKe/PK9U=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=FuNCQ0FcD+ZiIfF/od4b4YLkcRCXp0rGoT+N7WjM9oDvvlxsjT6MHIJpOjY9CAeLi lbBqMMTrBcbEomZO8hEKDPeNiifXlvgQ5BefORRhZ1Nl4clkVZeQIRufHGARJ6C4Gw ng2QdkYlG4zyiHeI4HnDVEmdka24eWcpTLlh2c12W7tw2yxbzZ0CTP2kdUhrl8mvuH 4gC+cNIrBnJ4z2e0d93ltIPinESo7lf5c/8fM3QHzetcQ2B0ERSZl6sqToa+s+mZpE su/MOeBms3n85AwVi5jrTulqPOCdt3gcitgUIVAxz94JxzVbcaoK99ml7BLHEgj7Yy jy7JMOcnJtY9w== Received: from [100.66.96.193] (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: vignesh) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 93DFB3781FE9; Tue, 7 May 2024 05:46:34 +0000 (UTC) Message-ID: <0e56241a-859b-45d6-bc7e-da2ed894d01a@collabora.com> Date: Tue, 7 May 2024 11:16:32 +0530 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 2/5] drm/ci: generate testlist from build Content-Language: en-US To: Dmitry Baryshkov 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 References: <20240430091121.508099-1-vignesh.raman@collabora.com> <20240430091121.508099-3-vignesh.raman@collabora.com> From: Vignesh Raman In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Dmitry, On 30/04/24 15:47, Dmitry Baryshkov wrote: > 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 >> --- >> 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? We need to handle arm/arm64 cases also. IGT is not generating test-list for arm and it is fixed now with https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/1cf83083f855894dd287d9cf84bbcc2952b52d02 Will uprev IGT to latest commit to include this fix. Thanks. Regards, Vignesh >> + >> 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 \ >