Hi Dmitry,
On 20/05/24 16:30, Dmitry Baryshkov wrote:
On Fri, May 17, 2024 at 02:54:58PM +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@xxxxxxxxxxxxx>
---
v2:
- Fix testlist generation for arm and arm64 builds.
---
drivers/gpu/drm/ci/build-igt.sh | 34 +
drivers/gpu/drm/ci/igt_runner.sh | 9 +-
drivers/gpu/drm/ci/testlist.txt | 2761 ------------------------------
3 files changed, 39 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 7859554756c4..e62244728613 100644
--- a/drivers/gpu/drm/ci/build-igt.sh
+++ b/drivers/gpu/drm/ci/build-igt.sh
[...]
@@ -26,6 +50,16 @@ meson build $MESON_OPTIONS $EXTRA_MESON_ARGS
ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
ninja -C build install
+if [[ "$KERNEL_ARCH" = "arm64" ]]; then
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/igt/lib/aarch64-linux-gnu
+elif [[ "$KERNEL_ARCH" = "arm" ]]; then
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/igt/lib
+else
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/igt/lib64
Could you please clarify this part? The arm64 vs arm don't look logical
from my point of view.
The rest LGTM.
The libs are installed in the below path for different arch.
> find . -name libigt.so
./x86/igt/lib64/libigt.so
./arm64/igt/lib/aarch64-linux-gnu/libigt.so
./arm/igt/lib/libigt.so
~/igt-build
So for arm64 it is 'lib/aarch64-linux-gnu' and arm it is 'lib'.
s3.freedesktop.org/artifacts/vigneshraman/linux/1179691/arm64/igt.tar.gz
s3.freedesktop.org/artifacts/vigneshraman/linux/1179691/arm/igt.tar.gz
s3.freedesktop.org/artifacts/vigneshraman/linux/1179691/x86_64/igt.tar.gz
Regards,
Vignesh
+fi
+
+generate_testlist
+
mkdir -p artifacts/
tar -cf artifacts/igt.tar /igt
