[LTP] [PATCH 01/10] lib: Introduce more TEST_* macros

Cyril Hrubis
2020-11-13T13:14:19Z

In order to simplify common return value checks.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
include/tst_test.h | 28 +------
include/tst_test_macros.h | 131 +++++++++++++++++++++++++++++++
lib/newlib_tests/.gitignore | 3 +
lib/newlib_tests/test_macros01.c | 40 ++++++++++
lib/newlib_tests/test_macros02.c | 42 ++++++++++
lib/newlib_tests/test_macros03.c | 40 ++++++++++
lib/tst_test.c | 1 +
7 files changed, 258 insertions(+), 27 deletions(-)
create mode 100644 include/tst_test_macros.h
create mode 100644 lib/newlib_tests/test_macros01.c
create mode 100644 lib/newlib_tests/test_macros02.c
create mode 100644 lib/newlib_tests/test_macros03.c

diff --git a/include/tst_test.h b/include/tst_test.h
index c91d3f18a..6d188a650 100644
--- a/include/tst_test.h
+++ b/include/tst_test.h
@@ -18,6 +18,7 @@

#include "tst_common.h"
#include "tst_res_flags.h"
+#include "tst_test_macros.h"
#include "tst_checkpoint.h"
#include "tst_device.h"
#include "tst_mkfs.h"
@@ -269,33 +270,6 @@ void tst_run_tcases(int argc, char *argv[], struct tst_test *self)
*/
void tst_reinit(void);

-//TODO Clean?
-#define TEST(SCALL) \
- do { \
- errno = 0; \
- TST_RET = SCALL; \
- TST_ERR = errno; \
- } while (0)
-
-#define TEST_VOID(SCALL) \
- do { \
- errno = 0; \
- SCALL; \
- TST_ERR = errno; \
- } while (0)
-
-extern long TST_RET;
-extern int TST_ERR;
-
-extern void *TST_RET_PTR;
-
-#define TESTPTR(SCALL) \
- do { \
- errno = 0; \
- TST_RET_PTR = (void*)SCALL; \
- TST_ERR = errno; \
- } while (0)
-
/*
* Functions to convert ERRNO to its name and SIGNAL to its name.
*/
diff --git a/include/tst_test_macros.h b/include/tst_test_macros.h
new file mode 100644
index 000000000..69de2ce3d
--- /dev/null
+++ b/include/tst_test_macros.h
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2015-2020 Cyril Hrubis <chrubis@suse.cz>
+ */
+
+#ifndef TST_TEST_MACROS_H__
+#define TST_TEST_MACROS_H__
+
+#define TEST(SCALL) \
+ do { \
+ errno = 0; \
+ TST_RET = SCALL; \
+ TST_ERR = errno; \
+ } while (0)
+
+#define TEST_VOID(SCALL) \
+ do { \
+ errno = 0; \
+ SCALL; \
+ TST_ERR = errno; \
+ } while (0)
+
+extern long TST_RET;
+extern int TST_ERR;
+extern int TST_PASS;
+
+extern void *TST_RET_PTR;
+
+#define TESTPTR(SCALL) \
+ do { \
+ errno = 0; \
+ TST_RET_PTR = (void*)SCALL; \
+ TST_ERR = errno; \
+ } while (0)
+
+
+#define TEST_2(_1, _2, ...) _2
+
+#define TEST_FMT_(FMT, _1, ...) FMT, ##__VA_ARGS__
+
+#define TEST_MSG(RES, FMT, SCALL, ...) \
+ tst_res_(__FILE__, __LINE__, RES, \
+ TEST_FMT_(TEST_2(dummy, ##__VA_ARGS__, SCALL) FMT, __VA_ARGS__))
+
+#define TEST_MSGP(RES, FMT, PAR, SCALL, ...) \
+ tst_res_(__FILE__, __LINE__, RES, \
+ TEST_FMT_(TEST_2(dummy, ##__VA_ARGS__, SCALL) FMT, __VA_ARGS__), PAR)
+
+#define TEST_FD(SCALL, ...) \
+ do { \
+ TEST(SCALL); \
+ \
+ TST_PASS = 0; \
+ \
+ if (TST_RET == -1) { \
+ TEST_MSG(TFAIL | TTERRNO, " failed", \
+ #SCALL, ##__VA_ARGS__); \
+ break; \
+ } \
+ \
+ if (TST_RET < 0) { \
+ TEST_MSGP(TFAIL | TTERRNO, " invalid retval %ld", \
+ TST_RET, #SCALL, ##__VA_ARGS__); \
+ break; \
+ } \
+ \
+ TEST_MSGP(TPASS, " returned fd %ld", TST_RET, \
+ #SCALL, ##__VA_ARGS__); \
+ \
+ TST_PASS = 1; \
+ \
+ } while (0)
+
+#define TEST_PASS(SCALL, ...) \
+ do { \
+ TEST(SCALL); \
+ \
+ TST_PASS = 0; \
+ \
+ if (TST_RET == -1) { \
+ TEST_MSG(TFAIL | TTERRNO, " failed", \
+ #SCALL, ##__VA_ARGS__); \
+ break; \
+ } \
+ \
+ if (TST_RET != 0) { \
+ TEST_MSGP(TFAIL | TTERRNO, " invalid retval %ld", \
+ TST_RET, #SCALL, ##__VA_ARGS__); \
+ break; \
+ } \
+ \
+ TEST_MSG(TPASS, " passed", #SCALL, ##__VA_ARGS__); \
+ \
+ TST_PASS = 1; \
+ \
+ } while (0)
+
+
+#define TEST_FAIL(SCALL, ERRNO, ...) \
+ do { \
+ TEST(SCALL); \
+ \
+ TST_PASS = 0; \
+ \
+ if (TST_RET == 0) { \
+ TEST_MSG(TFAIL | TTERRNO, " succeeded", \
+ #SCALL, ##__VA_ARGS__); \
+ break; \
+ } \
+ \
+ if (TST_RET != -1) { \
+ TEST_MSGP(TFAIL | TTERRNO, " invalid retval %ld", \
+ TST_RET, #SCALL, ##__VA_ARGS__); \
+ break; \
+ } \
+ \
+ if (ERRNO) { \
+ if (TST_ERR == ERRNO) { \
+ TEST_MSG(TPASS | TERRNO, "", \
+ #SCALL, ##__VA_ARGS__); \
+ TST_PASS = 1; \
+ } else { \
+ TEST_MSGP(TFAIL | TERRNO, " expected %s", \
+ tst_strerrno(ERRNO), \
+ #SCALL, ##__VA_ARGS__); \
+ } \
+ } \
+ } while (0)
+
+
+#endif /* TST_TEST_MACROS_H__ */
diff --git a/lib/newlib_tests/.gitignore b/lib/newlib_tests/.gitignore
index ac1d19be0..a5c652c99 100644
--- a/lib/newlib_tests/.gitignore
+++ b/lib/newlib_tests/.gitignore
@@ -36,3 +36,6 @@ test_kconfig02
variant
test_guarded_buf
tst_bool_expr
+test_macros01
+test_macros02
+test_macros03
diff --git a/lib/newlib_tests/test_macros01.c b/lib/newlib_tests/test_macros01.c
new file mode 100644
index 000000000..8b315b30f
--- /dev/null
+++ b/lib/newlib_tests/test_macros01.c
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
+ */
+
+/*
+ * Test macros.
+ */
+
+#include "tst_test.h"
+
+static int fail_fd(void)
+{
+ errno = EINVAL;
+ return -1;
+}
+
+static int pass_fd(void)
+{
+ return 42;
+}
+
+static int inval_val(void)
+{
+ return -42;
+}
+
+static void do_test(void)
+{
+ TEST_FD(fail_fd(), "TEST DESCRIPTION");
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_FD(pass_fd(), "%s", "TEST DESCRIPTION PARAM");
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_FD(inval_val());
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+}
+
+static struct tst_test test = {
+ .test_all = do_test,
+};
diff --git a/lib/newlib_tests/test_macros02.c b/lib/newlib_tests/test_macros02.c
new file mode 100644
index 000000000..41b685a36
--- /dev/null
+++ b/lib/newlib_tests/test_macros02.c
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
+ */
+
+/*
+ * Test macros.
+ */
+
+#include "tst_test.h"
+
+static int fail_fn(void)
+{
+ errno = EINVAL;
+ return -1;
+}
+
+static int pass_fn(void)
+{
+ return 0;
+}
+
+static int inval_ret_fn(void)
+{
+ return 42;
+}
+
+static void do_test(void)
+{
+ TEST_FAIL(fail_fn(), EINVAL);
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_FAIL(fail_fn(), ENOTTY);
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_FAIL(pass_fn(), ENOTTY);
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_FAIL(inval_ret_fn(), ENOTTY, "TEST DESCRIPTION");
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+}
+
+static struct tst_test test = {
+ .test_all = do_test,
+};
diff --git a/lib/newlib_tests/test_macros03.c b/lib/newlib_tests/test_macros03.c
new file mode 100644
index 000000000..731715308
--- /dev/null
+++ b/lib/newlib_tests/test_macros03.c
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
+ */
+
+/*
+ * Test macros.
+ */
+
+#include "tst_test.h"
+
+static int fail_fn(void)
+{
+ errno = EINVAL;
+ return -1;
+}
+
+static int pass_fn(void)
+{
+ return 0;
+}
+
+static int inval_ret_fn(void)
+{
+ return 42;
+}
+
+static void do_test(void)
+{
+ TEST_PASS(fail_fn());
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_PASS(pass_fn(), "TEST DESCRIPTION");
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+ TEST_PASS(inval_ret_fn());
+ tst_res(TINFO, "TST_PASS = %i", TST_PASS);
+}
+
+static struct tst_test test = {
+ .test_all = do_test,
+};
diff --git a/lib/tst_test.c b/lib/tst_test.c
index 535c0ff4c..6700a4eef 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -74,6 +74,7 @@ const char *tst_ipc_path = ipc_path;
static char shm_path[1024];

int TST_ERR;
+int TST_PASS;
long TST_RET;

static void do_cleanup(void);
--
2.26.2