From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 13 Oct 2016 07:26:07 +0000 (+0300)
Subject: tests: move ARG_STR and similar macros to tests.h
X-Git-Tag: v4.15~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d212c95b84ed4af10a83582a559cd54eb867e31e;p=strace

tests: move ARG_STR and similar macros to tests.h

* tests/add_key.c (_STR, ARG_STR): Move ...
* tests/tests.h: ... here.
(ARG_ULL_STR): New macro.
* tests/keyctl.c (ARG_STR): Remove.
* tests/quotactl.h (ARG_STR): Likewise.
* tests/request_key.c (ARG_STR): Likewise.
---

diff --git a/tests/add_key.c b/tests/add_key.c
index 62f4be36..57f12bfd 100644
--- a/tests/add_key.c
+++ b/tests/add_key.c
@@ -65,9 +65,6 @@ do_add_key(const char *type, const char *type_str, const char *desc,
 	printf(") = %s\n", errstr);
 }
 
-# define _STR(_arg) #_arg
-# define ARG_STR(_arg) (_arg), #_arg
-
 int
 main(void)
 {
diff --git a/tests/keyctl.c b/tests/keyctl.c
index b5809810..a60dcfcf 100644
--- a/tests/keyctl.c
+++ b/tests/keyctl.c
@@ -190,8 +190,6 @@ do_keyctl(kernel_ulong_t cmd, const char *cmd_str, ...)
 	printf(") = %s\n", errstr);
 }
 
-# define ARG_STR(_arg) (_arg), #_arg
-
 int
 main(void)
 {
diff --git a/tests/quotactl.h b/tests/quotactl.h
index b97153f1..edde915b 100644
--- a/tests/quotactl.h
+++ b/tests/quotactl.h
@@ -69,8 +69,6 @@
 	printf("%s%s=%#llx", (prefix), #field,	\
 	       zero_extend_signed_to_ull((where)->field))
 
-# define ARG_STR(_arg) (_arg), #_arg
-
 typedef void (*print_cb)(long rc, void *addr, void *arg);
 
 enum check_quotactl_flag_bits {
diff --git a/tests/request_key.c b/tests/request_key.c
index 361bf529..d88cd1e4 100644
--- a/tests/request_key.c
+++ b/tests/request_key.c
@@ -64,9 +64,6 @@ do_request_key(const char *type, const char *type_str, const char *desc,
 	printf(") = %s\n", errstr);
 }
 
-# define _STR(_arg) #_arg
-# define ARG_STR(_arg) (_arg), #_arg
-
 int
 main(void)
 {
diff --git a/tests/tests.h b/tests/tests.h
index 537300cf..4453702e 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -186,4 +186,8 @@ int send_mmsg(int, struct mmsghdr *, unsigned int, unsigned int);
 # endif
 # define LL_VAL_TO_PAIR(llval) LL_PAIR((long) ((llval) >> 32), (long) (llval))
 
+# define _STR(_arg) #_arg
+# define ARG_STR(_arg) (_arg), #_arg
+# define ARG_ULL_STR(_arg) _arg##ULL, #_arg
+
 #endif /* !STRACE_TESTS_H */