From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 15 Mar 2017 00:00:29 +0000 (+0000)
Subject: tests: do not check decoding of setitimer syscall outside xetitimer.test
X-Git-Tag: v4.17~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=245d6d20ce779945987f48faa2081c74550845d3;p=strace

tests: do not check decoding of setitimer syscall outside xetitimer.test

xetitimer.test already implements a comprehensive test of setitimer
syscall parser, no need to duplicate its parts in other tests.

* tests/clock_nanosleep.c (main): Remove setitimer expected output.
* tests/nanosleep.c (main): Likewise.
* tests/clock_nanosleep.test: Remove setitimer from the trace set.
* tests/nanosleep.test: Likewise.
---

diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
index 98407d7e..dacef441 100644
--- a/tests/clock_nanosleep.c
+++ b/tests/clock_nanosleep.c
@@ -1,4 +1,6 @@
 /*
+ * Check decoding of clock_nanosleep and clock_gettime syscalls.
+ *
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
@@ -89,12 +91,6 @@ main(void)
 
 	if (setitimer(ITIMER_REAL, &itv, NULL))
 		perror_msg_and_skip("setitimer");
-	printf("setitimer(ITIMER_REAL, {it_interval={tv_sec=%jd, tv_usec=%jd}"
-	       ", it_value={tv_sec=%jd, tv_usec=%jd}}, NULL) = 0\n",
-	       (intmax_t) itv.it_interval.tv_sec,
-	       (intmax_t) itv.it_interval.tv_usec,
-	       (intmax_t) itv.it_value.tv_sec,
-	       (intmax_t) itv.it_value.tv_usec);
 
 	--req.ts.tv_nsec;
 	assert(syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0,
diff --git a/tests/clock_nanosleep.test b/tests/clock_nanosleep.test
index ec434a60..b7619890 100755
--- a/tests/clock_nanosleep.test
+++ b/tests/clock_nanosleep.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Check clock_nanosleep, clock_gettime, and setitimer syscalls decoding.
+# Check decoding of clock_nanosleep and clock_gettime syscalls.
 
 . "${srcdir=.}/init.sh"
-run_strace_match_diff -e trace=clock_nanosleep,clock_gettime,setitimer
+run_strace_match_diff -e trace=clock_nanosleep,clock_gettime
diff --git a/tests/nanosleep.c b/tests/nanosleep.c
index 9f0e626f..647f2d45 100644
--- a/tests/nanosleep.c
+++ b/tests/nanosleep.c
@@ -1,4 +1,6 @@
 /*
+ * Check decoding of nanosleep syscall.
+ *
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
@@ -78,12 +80,6 @@ main(void)
 
 	if (setitimer(ITIMER_REAL, &itv, NULL))
 		perror_msg_and_skip("setitimer");
-	printf("setitimer(ITIMER_REAL, {it_interval={tv_sec=%jd, tv_usec=%jd}"
-	       ", it_value={tv_sec=%jd, tv_usec=%jd}}, NULL) = 0\n",
-	       (intmax_t) itv.it_interval.tv_sec,
-	       (intmax_t) itv.it_interval.tv_usec,
-	       (intmax_t) itv.it_value.tv_sec,
-	       (intmax_t) itv.it_value.tv_usec);
 
 	req.ts.tv_nsec = 999999999;
 	assert(nanosleep(&req.ts, &rem.ts) == -1);
diff --git a/tests/nanosleep.test b/tests/nanosleep.test
index 055a8dcd..4e59a6ae 100755
--- a/tests/nanosleep.test
+++ b/tests/nanosleep.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Check nanosleep and setitimer syscalls decoding.
+# Check decoding of nanosleep syscall.
 
 . "${srcdir=.}/init.sh"
-run_strace_match_diff -a20 -e trace=nanosleep,setitimer
+run_strace_match_diff -a20