aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Łyszczek <michal.lyszczek@bofc.pl>2018-10-08 21:52:25 +0200
committerMichał Łyszczek <michal.lyszczek@bofc.pl>2018-10-08 21:52:25 +0200
commitc5ab62a6d0940e89ae11b4611edbaea445dfe464 (patch)
tree006b15aec1c7851658d9a247dd8d37f341a01758
parent7ba71da5fd85306648bacdcb416617f7133d8f11 (diff)
downloadmtest-c5ab62a6d0940e89ae11b4611edbaea445dfe464.tar.gz
mtest-c5ab62a6d0940e89ae11b4611edbaea445dfe464.tar.bz2
mtest-c5ab62a6d0940e89ae11b4611edbaea445dfe464.zip
change named param macro to better match arguments
-rw-r--r--example/param-tests.c2
-rw-r--r--example/tests.c1
-rw-r--r--man/mt_assert.32
-rw-r--r--man/mt_defs.32
-rw-r--r--man/mt_fok.32
-rw-r--r--man/mt_return.32
-rw-r--r--man/mt_run.34
-rw-r--r--man/mtest_overview.74
-rw-r--r--mtest.h4
9 files changed, 12 insertions, 11 deletions
diff --git a/example/param-tests.c b/example/param-tests.c
index 99cc962..fe80c56 100644
--- a/example/param-tests.c
+++ b/example/param-tests.c
@@ -72,7 +72,7 @@ void named_param_test_in_loop(void)
*/
sprintf(test_name, "named param test add(%d, %d)", p.a, p.b);
- mt_run_named_param(add_test, &p, test_name);
+ mt_run_param_named(add_test, &p, test_name);
}
}
}
diff --git a/example/tests.c b/example/tests.c
index 80567d6..b3e5365 100644
--- a/example/tests.c
+++ b/example/tests.c
@@ -3,6 +3,7 @@
#include "add-tests.h"
#include "sub-tests.h"
#include "named-tests.h"
+#include "param-tests.h"
#include "calc.h"
diff --git a/man/mt_assert.3 b/man/mt_assert.3
index 3013a34..3b06a9b 100644
--- a/man/mt_assert.3
+++ b/man/mt_assert.3
@@ -49,7 +49,7 @@ Proper example can be found in
.BR mt_run (3),
.BR mt_run_named (3),
.BR mt_run_param (3),
-.BR mt_run_named_param (3),
+.BR mt_run_param_named (3),
.BR mt_fok (3),
.BR mt_ferr (3),
.BR mt_return (3),
diff --git a/man/mt_defs.3 b/man/mt_defs.3
index a6076e3..03791ca 100644
--- a/man/mt_defs.3
+++ b/man/mt_defs.3
@@ -114,7 +114,7 @@ has already been called in a single file.
.BR mt_run (3),
.BR mt_run_named (3),
.BR mt_run_param (3),
-.BR mt_run_named_param (3),
+.BR mt_run_param_named (3),
.BR mt_assert (3),
.BR mt_fail (3),
.BR mt_fok (3),
diff --git a/man/mt_fok.3 b/man/mt_fok.3
index dd09002..786fd33 100644
--- a/man/mt_fok.3
+++ b/man/mt_fok.3
@@ -73,7 +73,7 @@ under the hood.
.BR mt_run (3),
.BR mt_run_named (3),
.BR mt_run_param (3),
-.BR mt_run_named_param (3),
+.BR mt_run_param_named (3),
.BR mt_assert (3),
.BR mt_fail (3),
.BR mt_return (3)
diff --git a/man/mt_return.3 b/man/mt_return.3
index 4ce2d1f..c61a1b9 100644
--- a/man/mt_return.3
+++ b/man/mt_return.3
@@ -40,7 +40,7 @@ Proper example can be found in
.BR mt_run (3),
.BR mt_run_named (3),
.BR mt_run_param (3),
-.BR mt_run_named_param (3),
+.BR mt_run_param_named (3),
.BR mt_assert (3),
.BR mt_fail (3),
.BR mt_fok (3),
diff --git a/man/mt_run.3 b/man/mt_run.3
index 17cba99..c748ecd 100644
--- a/man/mt_run.3
+++ b/man/mt_run.3
@@ -19,7 +19,7 @@ c/c++
.br
.BI "mt_run_named(" function_name ", " test_name ")"
.br
-.BI "mt_run_named_param(" function_name_param ", " parameter ", " test_name ")"
+.BI "mt_run_param_named(" function_name_param ", " parameter ", " test_name ")"
.PP
.BI "static void (*" mt_prepare_test ")(void)"
.br
@@ -58,7 +58,7 @@ should be simple
.PP
.BR mt_run_param (3)
and
-.BR mt_run_named_param (3)
+.BR mt_run_param_named (3)
works in the same way as they non-parameter counterpart, but
.I parameter
will be passed to
diff --git a/man/mtest_overview.7 b/man/mtest_overview.7
index 43835ad..6f4172b 100644
--- a/man/mtest_overview.7
+++ b/man/mtest_overview.7
@@ -23,7 +23,7 @@ For c/c++
.br
.BI "mt_run_named(" function_name ", " test_name ")"
.br
-.BI "mt_run_named_param(" function_name_param ", " parameter ", " test_name ")"
+.BI "mt_run_param_named(" function_name_param ", " parameter ", " test_name ")"
.br
.BI "mt_assert(" expression ")"
.br
@@ -116,7 +116,7 @@ Example of using mt in posix shell
.BR mt_run (3),
.BR mt_run_named (3),
.BR mt_run_param (3),
-.BR mt_run_named_param (3),
+.BR mt_run_param_named (3),
.BR mt_assert (3),
.BR mt_fail (3),
.BR mt_fok (3),
diff --git a/mtest.h b/mtest.h
index 132971a..3f122f3 100644
--- a/mtest.h
+++ b/mtest.h
@@ -98,7 +98,7 @@
========================================================================== */
-#define mt_run_param(f, p) mt_run_named_param(f, p, #f)
+#define mt_run_param(f, p) mt_run_param_named(f, p, #f)
/* ==========================================================================
@@ -132,7 +132,7 @@
========================================================================== */
-#define mt_run_named_param(f, p, n) do { \
+#define mt_run_param_named(f, p, n) do { \
curr_test = n; \
mt_test_status = 0; \
++mt_total_tests; \