[PATCH 1/4] kselftest: add TAP13 conformant versions of ksft_* functions

[Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>]

From: Paul Elder <paul.elder@xxxxxxxx>

Add TAP13 conformat output functions to kselftest.h, while preserving
the old ksft_* output functions to allow backwards compatability.

Also add exit functions that output TAP13 exiting text, as well as
functions to keep track of testing progress.

Cc: Tim Bird <Tim.Bird@xxxxxxxx>
Signed-off-by: Paul Elder <paul.elder@xxxxxxxx>
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 tools/testing/selftests/kselftest.h | 77 +++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
index ef1c80d67ac7..c1a4599884c4 100644
--- a/tools/testing/selftests/kselftest.h
+++ b/tools/testing/selftests/kselftest.h
@@ -31,12 +31,24 @@ struct ksft_count {
 
 static struct ksft_count ksft_cnt;
 
+static inline int ksft_test_num(void)
+{
+	return ksft_cnt.ksft_pass + ksft_cnt.ksft_fail +
+		ksft_cnt.ksft_xfail + ksft_cnt.ksft_xpass +
+		ksft_cnt.ksft_xskip;
+}
+
 static inline void ksft_inc_pass_cnt(void) { ksft_cnt.ksft_pass++; }
 static inline void ksft_inc_fail_cnt(void) { ksft_cnt.ksft_fail++; }
 static inline void ksft_inc_xfail_cnt(void) { ksft_cnt.ksft_xfail++; }
 static inline void ksft_inc_xpass_cnt(void) { ksft_cnt.ksft_xpass++; }
 static inline void ksft_inc_xskip_cnt(void) { ksft_cnt.ksft_xskip++; }
 
+static inline void ksft_print_tap_header(void)
+{
+	printf("TAP version 13\n");
+}
+
 static inline void ksft_print_cnts(void)
 {
 	printf("Pass: %d Fail: %d Xfail: %d Xpass: %d, Xskip: %d\n",
@@ -45,25 +57,90 @@ static inline void ksft_print_cnts(void)
 		ksft_cnt.ksft_xskip);
 }
 
+static inline void ksft_print_cnts_tap(void)
+{
+	printf("1..%d\n", ksft_test_num());
+}
+
+static inline void ksft_test_result_pass(const char *msg)
+{
+	ksft_cnt.ksft_pass++;
+	printf("ok %d %s\n", ksft_test_num(), msg);
+}
+
+static inline void ksft_test_result_fail(const char *msg)
+{
+	ksft_cnt.ksft_fail++;
+	printf("not ok %d %s\n", ksft_test_num(), msg);
+}
+
+static inline void ksft_test_result_skip(const char *msg)
+{
+	ksft_cnt.ksft_xskip++;
+	printf("ok %d # skip %s\n", ksft_test_num(), msg);
+}
+
 static inline int ksft_exit_pass(void)
 {
 	exit(KSFT_PASS);
 }
+
+static inline int ksft_exit_pass_tap(void)
+{
+	ksft_print_cnts_tap();
+	exit(KSFT_PASS);
+}
+
 static inline int ksft_exit_fail(void)
 {
 	exit(KSFT_FAIL);
 }
+
+static inline int ksft_exit_fail_tap(void)
+{
+	printf("Bail out!\n");
+	ksft_print_cnts_tap();
+	exit(KSFT_FAIL);
+}
+
+static inline int ksft_exit_fail_tap_msg(const char *msg)
+{
+	printf("Bail out! %s\n", msg);
+	ksft_print_cnts_tap();
+	exit(KSFT_FAIL);
+}
+
 static inline int ksft_exit_xfail(void)
 {
 	exit(KSFT_XFAIL);
 }
+
+static inline int ksft_exit_xfail_tap(void)
+{
+	ksft_print_cnts_tap();
+	exit(KSFT_XFAIL);
+}
+
 static inline int ksft_exit_xpass(void)
 {
 	exit(KSFT_XPASS);
 }
+
+static inline int ksft_exit_xpass_tap(void)
+{
+	ksft_print_cnts_tap();
+	exit(KSFT_XPASS);
+}
+
 static inline int ksft_exit_skip(void)
 {
 	exit(KSFT_SKIP);
 }
 
+static inline int ksft_exit_skip_tap(void)
+{
+	ksft_print_cnts_tap();
+	exit(KSFT_SKIP);
+}
+
 #endif /* __KSELFTEST_H */
-- 
2.13.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html