From: Martin Doucha <mdoucha@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2 1/2] Add TST_ASSERT_SYSCALL*() macros
Date: Thu, 5 Mar 2020 16:14:58 +0100 [thread overview]
Message-ID: <20200305151459.30341-1-mdoucha@suse.cz> (raw)
These macros take care of the standard return value checking boilerplate
in cases where the test cannot continue after error.
- TST_ASSERT_SYSCALL() calls tst_brk() if retval != 0
- TST_ASSERT_SYSCALL_FD() calls tst_brk() if retval < 0
Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---
Changes since v1: Added support for call args pretty printing in error message
include/tst_test.h | 47 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/include/tst_test.h b/include/tst_test.h
index 8508c2e38..e423ceacc 100644
--- a/include/tst_test.h
+++ b/include/tst_test.h
@@ -281,6 +281,53 @@ extern void *TST_RET_PTR;
TST_ERR = errno; \
} while (0)
+/* assert that syscall returned only 0 and nothing else */
+#define TST_ASSERT_SYSCALL(SCALL) \
+ TST_ASSERT_SYSCALL_IMPL(SCALL, __FILE__, __LINE__, #SCALL)
+
+#define TST_ASSERT_SYSCALL_IMPL(SCALL, FILENAME, LINENO, CALLSTR, ...) \
+ ({ \
+ int _tst_ret; \
+ errno = 0; \
+ _tst_ret = SCALL; \
+ if (_tst_ret == -1) { \
+ int _tst_ttype = errno == ENOTSUP ? TCONF : TBROK; \
+ tst_brk_(FILENAME, LINENO, _tst_ttype | TERRNO, \
+ CALLSTR " failed", ##__VA_ARGS__); \
+ } \
+ if (_tst_ret != 0) { \
+ tst_brk_(FILENAME, LINENO, TBROK | TERRNO, \
+ CALLSTR " returned invalid value %d", \
+ ##__VA_ARGS__, _tst_ret); \
+ } \
+ _tst_ret; \
+ })
+
+/*
+ * assert that syscall returned any non-negative value (e.g. valid file
+ * descriptor)
+ */
+#define TST_ASSERT_SYSCALL_FD(SCALL) \
+ TST_ASSERT_SYSCALL_FD_IMPL(SCALL, __FILE__, __LINE__, #SCALL)
+
+#define TST_ASSERT_SYSCALL_FD_IMPL(SCALL, FILENAME, LINENO, CALLSTR, ...) \
+ ({ \
+ int _tst_ret; \
+ errno = 0; \
+ _tst_ret = SCALL; \
+ if (_tst_ret == -1) { \
+ int _tst_ttype = errno == ENOTSUP ? TCONF : TBROK; \
+ tst_brk_(FILENAME, LINENO, _tst_ttype | TERRNO, \
+ CALLSTR " failed", ##__VA_ARGS__); \
+ } \
+ if (_tst_ret < 0) { \
+ tst_brk_(FILENAME, LINENO, TBROK | TERRNO, \
+ CALLSTR " returned invalid value %d", \
+ ##__VA_ARGS__, _tst_ret); \
+ } \
+ _tst_ret; \
+ })
+
/*
* Functions to convert ERRNO to its name and SIGNAL to its name.
*/
--
2.25.1
next reply other threads:[~2020-03-05 15:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 15:14 Martin Doucha [this message]
2020-03-05 15:14 ` [LTP] [PATCH v2 2/2] Reimplement TST_SAFE_TIMERFD_*() using TST_ASSERT_SYSCALL*() Martin Doucha
2020-03-05 15:20 ` Cyril Hrubis
2020-03-05 17:50 ` Petr Vorel
2020-03-05 17:42 ` [LTP] [PATCH v2 1/2] Add TST_ASSERT_SYSCALL*() macros Petr Vorel
2020-03-05 17:53 ` Cyril Hrubis
2020-03-05 19:36 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200305151459.30341-1-mdoucha@suse.cz \
--to=mdoucha@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox