From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 27 Feb 2015 01:39:26 +0000 (+0000)
Subject: tests: drop support for alternative names of select syscall
X-Git-Tag: v4.10~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=599819dfd540acbceee98ac8730415952bef51de;p=strace

tests: drop support for alternative names of select syscall

This mostly reverts commit 4a00fc4867bde7a4c333f238851e5cb03f02c824.

* tests/select.awk: Drop _newselect support.
* tests/select.test: Skip if select syscall is not supported.
---

diff --git a/tests/select.awk b/tests/select.awk
index 7c97c402..142504ae 100644
--- a/tests/select.awk
+++ b/tests/select.awk
@@ -1,8 +1,7 @@
 BEGIN {
-	select = "^(select|_newselect)"
-	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] = "^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[4] = "^\\+\\+\\+ exited with 0 \\+\\+\\+$"
 	lines = 4
 	fail = 0
diff --git a/tests/select.test b/tests/select.test
index 52f8b048..bd3066ba 100755
--- a/tests/select.test
+++ b/tests/select.test
@@ -6,20 +6,13 @@
 
 check_prog awk
 
+$STRACE -eselect -h > /dev/null ||
+	skip_ 'select syscall is not supported on this architecture'
+
 ./select ||
 	framework_skip_ 'select syscall does not behave as expected'
 
-syscall=
-for n in select _newselect; do
-	if $STRACE -e$n -h > /dev/null; then
-		syscall=$n
-		break
-	fi
-done
-[ -n "$syscall" ] ||
-	fail_ "$STRACE does not support select syscall?"
-
-args="-e$syscall ./select"
+args='-eselect ./select'
 $STRACE -o "$LOG" $args || {
 	cat "$LOG"
 	fail_ "$STRACE $args failed"