Skip to contentSkip to conversation

tst_test_macros.h: Add TST_EXP_VAL macro

PATCH Superseded zhanglianjie 3 participants 3 messages Aug 30, 2021

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tst_test_macros.h: Add TST_EXP_VAL macro

Add TST_EXP_VAL to determine whether the return value is equal to the given value.

include/tst_test_macros.h +28 -0
index 50598aa15..0ccc01f49 100644
@@ -132,6 +132,34 @@ extern void *TST_RET_PTR;
 			TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__);     \
 	} while (0)                                                            \
 
+
+#define TST_EXP_VAL_SILENT_(SCALL, SSCALL, VAL, ...)                           \
+	do {                                                                   \
+		TEST(SCALL);                                                   \
+		                                                               \
+		TST_PASS = 0;                                                  \
+		                                                               \
+		if (TST_RET != VAL) {                                          \
+			TST_MSGP_(TFAIL | TTERRNO, " retval not %ld",          \
+			          (long )VAL, SSCALL, ##__VA_ARGS__);          \
+			break;                                                 \
+		}                                                              \
+		                                                               \
+		TST_PASS = 1;                                                  \
+		                                                               \
+	} while (0)
+
+#define TST_EXP_VAL_SILENT(SCALL, VAL, ...) TST_EXP_VAL_SILENT_(SCALL, #SCALL, VAL, ##__VA_ARGS__)
+
+#define TST_EXP_VAL(SCALL, VAL, ...)                                           \
+	do {                                                                   \
+		TST_EXP_VAL_SILENT(SCALL, VAL, ##__VA_ARGS__);                 \
+		                                                               \
+		if (TST_PASS)                                                  \
+			TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__);     \
+			                                                       \
+	} while(0)
+
 #define TST_EXP_FAIL_(PASS_COND, SCALL, SSCALL, ERRNO, ...)                    \
 	do {                                                                   \
 		TEST(SCALL);                                                   \

--
2.20.1

#1 lore raw

PATCH v2 1/1 tst_test_macros.h: Add TST_EXP_VAL macro

Quoted 5 lines · zhanglianjie

Add TST_EXP_VAL to determine whether the return value is equal to the given value.

Quoted 77 lines
include/tst_test_macros.h +18 -0
index 50598aa15..0ccc01f49 100644
@@ -132,6 +132,34 @@ extern void *TST_RET_PTR;
                        TST_MSG_(TPASS, " passed", #SCALL,
 ##__VA_ARGS__);     \
        } while (0)
    \
 
+
+#define TST_EXP_VAL_SILENT_(SCALL, SSCALL, VAL, ...)
     \
+       do {
     \
+               TEST(SCALL);
     \
+
    \
+               TST_PASS = 0;
    \
+
    \
+               if (TST_RET != VAL) {
    \
+                       TST_MSGP_(TFAIL | TTERRNO, " retval not %ld",
    \
+                                 (long )VAL, SSCALL, ##__VA_ARGS__);
    \
+                       break;
     \
+               }
    \
+
    \
+               TST_PASS = 1;
    \
+
    \
+       } while (0)
+
+#define TST_EXP_VAL_SILENT(SCALL, VAL, ...) TST_EXP_VAL_SILENT_(SCALL,

#SCALL, VAL, ##__VA_ARGS__)

include/tst_test_macros.h +7 -0
+
+#define TST_EXP_VAL(SCALL, VAL, ...)
     \
+       do {
     \
+               TST_EXP_VAL_SILENT(SCALL, VAL, ##__VA_ARGS__);
     \
+
    \
+               if (TST_PASS)
    \
+                       TST_MSG_(TPASS, " passed", #SCALL,

##__VA_ARGS__); \

include/tst_test_macros.h +3 -1
+
    \
+       } while(0)
+
 #define TST_EXP_FAIL_(PASS_COND, SCALL, SSCALL, ERRNO, ...)
      \
        do {
     \
                TEST(SCALL);
     \
--

2.20.1

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210830/f0150db9/attachment.htm>
#2 lore raw

PATCH v2 1/1 tst_test_macros.h: Add TST_EXP_VAL macro

In reply to zhanglianjie

Hi!

Quoted 11 lines
include/tst_test_macros.h +11 -0
+#define TST_EXP_VAL_SILENT_(SCALL, SSCALL, VAL, ...)                           \
+	do {                                                                   \
+		TEST(SCALL);                                                   \
+		                                                               \
+		TST_PASS = 0;                                                  \
+		                                                               \
+		if (TST_RET != VAL) {                                          \
+			TST_MSGP_(TFAIL | TTERRNO, " retval not %ld",          \
+			          (long )VAL, SSCALL, ##__VA_ARGS__);          \
+			break;                                                 \
+		}                                                              \

include/tst_test_macros.h extern void *TST_RET_PTR; · line 156

Quoted 10 lines
include/tst_test_macros.h +10 -0
+		                                                               \
+		TST_PASS = 1;                                                  \
+		                                                               \
+	} while (0)
+
+#define TST_EXP_VAL_SILENT(SCALL, VAL, ...) TST_EXP_VAL_SILENT_(SCALL, #SCALL, VAL, ##__VA_ARGS__)
+
+#define TST_EXP_VAL(SCALL, VAL, ...)                                           \
+	do {                                                                   \
+		TST_EXP_VAL_SILENT(SCALL, VAL, ##__VA_ARGS__);                 \

Shouldn't we call the VAL_SILENT_() variant here and stringify the SCALL here? Otherwise I guess that this will introduce the same problem I was fixing in the "stringify early" patch.

Other than this it looks good.

Signature · 2 lines
Cyril Hrubis
[email protected]