diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-05-09 08:05:56 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-05-09 08:11:06 +0000 |
| commit | 2ae8dd4d066e7d7585bd4aecc606351722bd1955 (patch) | |
| tree | 34b9a7f4ada0ce6aa4c3eb2ca5aaf7f4f13ec394 | |
| parent | 3f2b59e54804144df6793f9e96c48215c7f5a234 (diff) | |
| download | aports-2ae8dd4d066e7d7585bd4aecc606351722bd1955.tar.bz2 aports-2ae8dd4d066e7d7585bd4aecc606351722bd1955.tar.xz | |
main/wayland: work around debugger detection in wayland
testsuite tries to detect if a debugger is attached. the detector
will give alse positive on grsec kernels. Add an environment variable to
force work around it.
| -rw-r--r-- | main/wayland/APKBUILD | 8 | ||||
| -rw-r--r-- | main/wayland/tests-ignore-debugger.patch | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/main/wayland/APKBUILD b/main/wayland/APKBUILD index e9b0192068..141463313f 100644 --- a/main/wayland/APKBUILD +++ b/main/wayland/APKBUILD @@ -13,7 +13,8 @@ depends_dev="libffi-dev expat-dev" makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev bash" subpackages="$pkgname-dev $pkgname-libs-client:_libs $pkgname-libs-egl:_libs $pkgname-libs-cursor:_libs $pkgname-libs-server:_libs" -source="http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz" +source="http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz + tests-ignore-debugger.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -34,7 +35,7 @@ build() { check() { cd "$builddir" - make check + make check WAYLAND_TEST_IGNORE_DEBUGGER=1 } package() { @@ -60,4 +61,5 @@ _libs() { mv "$pkgdir"/usr/lib/*-$name.so.* "$subpkgdir"/usr/lib } -sha512sums="f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8 wayland-1.15.0.tar.xz" +sha512sums="f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8 wayland-1.15.0.tar.xz +0f65a55265e9134ab08cabf67f9d1919c85c4cb6b69129e78bc6c50057cafcaf143007716a0fa73b2eb43d6b605944c320a12a36dbb5f15fcd2f5e770248c480 tests-ignore-debugger.patch" diff --git a/main/wayland/tests-ignore-debugger.patch b/main/wayland/tests-ignore-debugger.patch new file mode 100644 index 0000000000..a0cf97be46 --- /dev/null +++ b/main/wayland/tests-ignore-debugger.patch @@ -0,0 +1,14 @@ +diff --git a/tests/test-runner.c b/tests/test-runner.c +index 82a0a7b..8c7e90d 100644 +--- a/tests/test-runner.c ++++ b/tests/test-runner.c +@@ -287,6 +287,9 @@ is_debugger_attached(void) + pid_t pid; + int pipefd[2]; + ++ if (getenv("WAYLAND_TEST_IGNORE_DEBUGGER")) ++ return 0; ++ + if (pipe(pipefd) == -1) { + perror("pipe"); + return 0; |