forked from pool/strace
0b44e76647
- 0001-aarch64-fix-rt_sigreturn-decoding.patch, 0002-m68k-define-HAVE_SA_RESTORER.patch, 0003-Fix-decoding-of-mmap2-for-arm.patch, 0005-tests-select.test-handle-architectures-using-pselect.patch, 0006-aarch64-fix-ioctl-decoding.patch, 0007-m68k-fix-sigreturn-decoding.patch, 0008-Fix-crash-in-ipc_sem-test.patch, 0009-tests-ipc_-match-IPC_64-flag.patch, 0010-semctl-fix-indirect-syscall-decoding.patch, 0011-Fix-stat64-st_-acm-time-decoding-for-personalities-w.patch, 0012-tests-verify-that-all-patterns-match.patch, 0013-aarch64-properly-decode-generic-syscalls.patch, 0014-stat64-v.test-add-newfstatat-syscall-support.patch, 0015-tests-uid-use-fchown-instead-of-chown.patch: Patches from upstream to fix testsuite failure. - Enable libunwind support (strace -k). OBS-URL: https://build.opensuse.org/request/show/292570 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=44
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 95336102eb836ba69a2b51a3bbe733abd63bbe77 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
Date: Thu, 12 Mar 2015 16:47:38 +0100
|
|
Subject: [PATCH 05/15] tests/select.test: handle architectures using pselect6
|
|
syscall
|
|
|
|
* tests/select.awk (BEGIN): Update regexps to match both select
|
|
and pselect6 syscalls.
|
|
* tests/select.test: Probe for both select and pselect6 syscall.
|
|
---
|
|
tests/select.awk | 6 +++---
|
|
tests/select.test | 7 +++++--
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/tests/select.awk b/tests/select.awk
|
|
index 142504a..688cefe 100644
|
|
--- a/tests/select.awk
|
|
+++ b/tests/select.awk
|
|
@@ -1,7 +1,7 @@
|
|
BEGIN {
|
|
- r[1] = "^select\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL\\) += 1 \\(\\)$"
|
|
- r[2] = "^select\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL\\) += -1 "
|
|
- r[3] = "^select\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100\\}\\) += 0 \\(Timeout\\)$"
|
|
+ r[1] = "^p?select6?\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL(, 0)?\\) += 1 \\(\\)$"
|
|
+ r[2] = "^p?select6?\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL(, 0)?\\) += -1 "
|
|
+ r[3] = "^p?select6?\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100(000)?\\}(, 0)?\\) += 0 \\(Timeout\\)$"
|
|
r[4] = "^\\+\\+\\+ exited with 0 \\+\\+\\+$"
|
|
lines = 4
|
|
fail = 0
|
|
diff --git a/tests/select.test b/tests/select.test
|
|
index bd3066b..5d5fe54 100755
|
|
--- a/tests/select.test
|
|
+++ b/tests/select.test
|
|
@@ -6,13 +6,16 @@
|
|
|
|
check_prog awk
|
|
|
|
-$STRACE -eselect -h > /dev/null ||
|
|
+syscall=
|
|
+$STRACE -epselect6 -h > /dev/null && syscall=$syscall,pselect6
|
|
+$STRACE -eselect -h > /dev/null && syscall=$syscall,select
|
|
+test -n "$syscall" ||
|
|
skip_ 'select syscall is not supported on this architecture'
|
|
|
|
./select ||
|
|
framework_skip_ 'select syscall does not behave as expected'
|
|
|
|
-args='-eselect ./select'
|
|
+args="-e$syscall ./select"
|
|
$STRACE -o "$LOG" $args || {
|
|
cat "$LOG"
|
|
fail_ "$STRACE $args failed"
|
|
--
|
|
2.3.3
|
|
|