Add FRSH support to wvtest

diff --git a/c/Makefile.omk b/c/Makefile.omk
index c7ade36a4b52e3c27f97ba2b6c0ae0df279ebc24..58851512c4a7075b790ed7532125a43377108cd2 100644 (file)
--- a/c/Makefile.omk
+++ b/c/Makefile.omk
@@ -3,7 +3,7 @@ include_HEADERS = wvtest.h
 CFLAGS += -DWVTEST_CONFIGURED
 
 lib_LIBRARIES = wvtest
-wvtest_SOURCES = wvtestmain.c wvtest.c
+wvtest_SOURCES = wvtestmain.c wvtest.c wvtestfrsh.c
 
 wvtest_PROGRAMS = wvtest.t
 wvtest.t_SOURCES = t/wvtest.t.c

diff --git a/c/wvtest.h b/c/wvtest.h
index 71b33f69db32e3d8fba0b17b70c674e7f2bc4f13..c324dc6a5dec4f09ac0fd859d8c154d89d3e5bfc 100644 (file)
--- a/c/wvtest.h
+++ b/c/wvtest.h
@@ -39,6 +39,8 @@ bool wvtest_start_check_eq_str(const char *file, int line,
                               const char *a, const char *b, bool expect_pass);
 bool wvtest_start_check_lt_str(const char *file, int line,
                               const char *a, const char *b);
+int wvtest_start_check_frsh(const char *file, int line,
+                           const char *condstr, int frsh_retval);
 
 
 #define WVPASS(cond) \
@@ -61,6 +63,9 @@ bool wvtest_start_check_lt_str(const char *file, int line,
 #define WVPASSNESTR(a, b) WVFAILEQSTR(a, b)
 #define WVFAILNE(a, b) WVPASSEQ(a, b)
 #define WVFAILNESTR(a, b) WVPASSEQSTR(a, b)
+#define WVFRSH(frshretval) \
+       wvtest_start_check_frsh(__FILE__, __LINE__, #frshretval, (frshretval))
+
 
 #define WVTEST_MAIN3(_descr, ff, ll, _slowness)                                \
        static void _wvtest_main_##ll();                                \

diff --git a/c/wvtestfrsh.c b/c/wvtestfrsh.c
new file mode 100644 (file)
index 0000000..cc1f276
--- /dev/null
+++ b/c/wvtestfrsh.c
@@ -0,0 +1,15 @@
+#include "wvtest.h"
+#include <frsh_error.h>
+
+int wvtest_start_check_frsh(const char *file, int line,
+                            const char *condstr, int frsh_retval)
+{
+       char errstr[80] = "ok";
+       wvtest_start(file, line, condstr);
+       if (frsh_retval != 0)
+               frsh_strerror (frsh_retval, errstr, sizeof(errstr));
+
+       wvtest_check(frsh_retval == 0, errstr);
+
+       return frsh_retval;
+}