Changeset 10702

Timestamp:

Dec 13, 2006, 3:37:17 PM (19 years ago)

Author:

jhoblitt

Message:

add diag output to ok_strn()

File:

• trunk/psLib/test/pstap/src/pstap.h (modified) (3 diffs)

trunk/psLib/test/pstap/src/pstap.h

@@ -40 +40 @@
 }
 
-# define ok_strn(VALUE,EXPECT,N,COMMENT, ...)\
-ok(strncmp(VALUE, EXPECT, N) == 0, COMMENT, ## __VA_ARGS__);
+# define ok_strn(VALUE, EXPECT, N, COMMENT, ...)\
+{ \
+    int cmp = (strncmp(VALUE, EXPECT, N) == 0); \
+    ok(cmp, COMMENT, ## __VA_ARGS__); \
+    if (!cmp) { \
+        diag("         got: '%s'", VALUE); \
+        diag("    expected: '%s'", EXPECT); \
+    } \
+}
 
 #elif __STDC_VERSION__ >= 199901L /* __GNUC__ */
@@ -61 +68 @@
 ok((fabsl((VALUE)-(EXPECT)) < )(TOL)), __VA_ARGS__);
 
-# define ok_str(VALUE, EXPECT, COMMENT, ...) \
+# define ok_str(VALUE, EXPECT, ...) \
 { \
     int cmp = (strcmp(VALUE, EXPECT) == 0); \
@@ -71 +78 @@
 }
 
-# define ok_strn(VALUE,EXPECT,N, ...)\
-ok(strncmp(VALUE, EXPECT, N) == 0, __VA_ARGS__);
+# define ok_strn(VALUE, EXPECT, N, ...)\
+{ \
+    int cmp = (strncmp(VALUE, EXPECT, N) == 0); \
+    ok(cmp, COMMENT,  __VA_ARGS__); \
+    if (!cmp) { \
+        diag("         got: '%s'", VALUE); \
+        diag("    expected: '%s'", EXPECT); \
+    } \
+}
 
 #else /* __STDC_VERSION__ */