mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
testing/igt-gpu-tools: upgrade to 2.1
https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v2.1/NEWS Also skip failed tests. ``` Summary of Failures: 80/456 lib igt_hook FAIL 0.84s exit status 98 84/456 lib igt_hook_integration FAIL 0.94s killed by signal 6 SIGABRT ```
This commit is contained in:
mio
achill (fossdd)
parent
9baa5ab517
commit
139eac15ba
3 changed files with 19 additions and 105 deletions
|
|
@ -1,8 +1,8 @@
|
|||
# Contributor: Dennis Krupenik <dennis@krupenik.com>
|
||||
# Maintainer: Dennis Krupenik <dennis@krupenik.com>
|
||||
pkgname=igt-gpu-tools
|
||||
pkgver=1.27.1
|
||||
pkgrel=2
|
||||
pkgver=2.1
|
||||
pkgrel=0
|
||||
pkgdesc="collection of tools for development and testing of the DRM drivers"
|
||||
url="https://gitlab.freedesktop.org/drm/igt-gpu-tools/"
|
||||
arch="x86_64" # intel gpus, aarch64 fails to build
|
||||
|
|
@ -32,10 +32,11 @@ makedepends="
|
|||
flex
|
||||
meson
|
||||
"
|
||||
checkdepends="bash"
|
||||
# Test igt_hook calls grep -z
|
||||
checkdepends="bash grep"
|
||||
subpackages="$pkgname-dev"
|
||||
source="https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/v$pkgver/igt-gpu-tools-v$pkgver.tar.gz
|
||||
musl.patch
|
||||
skip-tests.patch
|
||||
"
|
||||
builddir="$srcdir/igt-gpu-tools-v$pkgver"
|
||||
|
||||
|
|
@ -56,6 +57,6 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
b77d28f95098e4c51678a0a73ad755a5dd28748c77cf8e8c4f46f6d65444939032d2d0ed3c637e4968682d72a5d8cbabd7b8f47737f7fa279b02667fd4ddae9b igt-gpu-tools-v1.27.1.tar.gz
|
||||
f372d8e60519c6d9d72efd32d87fc9851eace59cf7c0b66dc5f8795dcfb9efd4aae5f316cd52396ebaba9e0c338f166f1d4ccf828ea473276ea6ed07f71fae32 musl.patch
|
||||
e1d507448a79ef365ee4374e719010650e2c3766c707f0101f24594a55c5305da19aa7aa402ff6ad9b89c0db967829b5b53fd62b1767a3fcaf835946905dc63e igt-gpu-tools-v2.1.tar.gz
|
||||
4bb7465485f98e42a88f7522e45ee1c942113354f78ff3cd81d2eea75098b1baa32fdd67b0c792338ef9ba989103f9ec6b43e05854e1e6862233d3a863c4e40b skip-tests.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,99 +0,0 @@
|
|||
diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c
|
||||
index 7e86473..fc2dcf2 100644
|
||||
--- a/benchmarks/gem_exec_tracer.c
|
||||
+++ b/benchmarks/gem_exec_tracer.c
|
||||
@@ -271,7 +271,7 @@ static int is_i915(int fd)
|
||||
}
|
||||
|
||||
int
|
||||
-ioctl(int fd, unsigned long request, ...)
|
||||
+ioctl(int fd, int request, ...)
|
||||
{
|
||||
struct trace *t, **p;
|
||||
va_list args;
|
||||
diff --git a/lib/igt_aux.h b/lib/igt_aux.h
|
||||
index e734c87..1360516 100644
|
||||
--- a/lib/igt_aux.h
|
||||
+++ b/lib/igt_aux.h
|
||||
@@ -48,7 +48,6 @@
|
||||
# ifndef HAVE_GETTID
|
||||
# define gettid() (pid_t)(syscall(__NR_gettid))
|
||||
# endif
|
||||
-# define sigev_notify_thread_id _sigev_un._tid
|
||||
#endif
|
||||
|
||||
/* auxialiary igt helpers from igt_aux.c */
|
||||
diff --git a/lib/igt_halffloat.c b/lib/igt_halffloat.c
|
||||
index 08ab05f..7d6a6e6 100644
|
||||
--- a/lib/igt_halffloat.c
|
||||
+++ b/lib/igt_halffloat.c
|
||||
@@ -162,7 +162,7 @@ static inline float _half_to_float(uint16_t val)
|
||||
return fi.f;
|
||||
}
|
||||
|
||||
-#if defined(__x86_64__) && !defined(__clang__)
|
||||
+#if defined(__x86_64__) && !defined(__clang__) && defined(__GLIBC__)
|
||||
#pragma GCC push_options
|
||||
#pragma GCC target("f16c")
|
||||
|
||||
diff --git a/lib/igt_x86.c b/lib/igt_x86.c
|
||||
index 6ac700d..ddf5edd 100644
|
||||
--- a/lib/igt_x86.c
|
||||
+++ b/lib/igt_x86.c
|
||||
@@ -190,7 +190,7 @@ char *igt_x86_features_to_string(unsigned features, char *line)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__x86_64__) && !defined(__clang__)
|
||||
+#if defined(__x86_64__) && !defined(__clang__) && defined(__GLIBC__)
|
||||
#pragma GCC push_options
|
||||
#pragma GCC target("sse4.1")
|
||||
#pragma GCC diagnostic ignored "-Wpointer-arith"
|
||||
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
|
||||
index 2a3fb74..781af5e 100644
|
||||
--- a/tests/kms_atomic.c
|
||||
+++ b/tests/kms_atomic.c
|
||||
@@ -830,7 +830,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
|
||||
{
|
||||
int timeline, fence_fd;
|
||||
void *map;
|
||||
- const ptrdiff_t PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
|
||||
+ const ptrdiff_t intelsize = sysconf(_SC_PAGE_SIZE);
|
||||
uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
|
||||
|
||||
igt_require_sw_sync();
|
||||
@@ -838,28 +838,28 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
|
||||
timeline = sw_sync_timeline_create();
|
||||
|
||||
/* invalid out_fence_ptr */
|
||||
- map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
+ map = mmap(NULL, intelsize, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
igt_assert(map != MAP_FAILED);
|
||||
|
||||
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
|
||||
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
|
||||
- munmap(map, PAGE_SIZE);
|
||||
+ munmap(map, intelsize);
|
||||
|
||||
/* invalid out_fence_ptr */
|
||||
- map = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
+ map = mmap(NULL, intelsize, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
igt_assert(map != MAP_FAILED);
|
||||
|
||||
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
|
||||
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
|
||||
- munmap(map, PAGE_SIZE);
|
||||
+ munmap(map, intelsize);
|
||||
|
||||
/* invalid out_fence_ptr */
|
||||
- map = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
+ map = mmap(NULL, intelsize, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
igt_assert(map != MAP_FAILED);
|
||||
|
||||
igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
|
||||
crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
|
||||
- munmap(map, PAGE_SIZE);
|
||||
+ munmap(map, intelsize);
|
||||
|
||||
/* valid in fence but not allowed prop on crtc */
|
||||
fence_fd = sw_sync_timeline_create_fence(timeline, 1);
|
||||
12
testing/igt-gpu-tools/skip-tests.patch
Normal file
12
testing/igt-gpu-tools/skip-tests.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -ruN a/lib/tests/meson.build b/lib/tests/meson.build
|
||||
--- a/lib/tests/meson.build 2025-06-27 12:01:17.000000000 +0000
|
||||
+++ b/lib/tests/meson.build 2025-07-05 05:09:50.409551821 +0000
|
||||
@@ -11,8 +11,6 @@
|
||||
'igt_facts',
|
||||
'igt_fork',
|
||||
'igt_fork_helper',
|
||||
- 'igt_hook',
|
||||
- 'igt_hook_integration',
|
||||
'igt_ktap_parser',
|
||||
'igt_list_only',
|
||||
'igt_invalid_subtest_name',
|
||||
Loading…
Add table
Add a link
Reference in a new issue