Changeset 9935

Timestamp:

Nov 9, 2006, 1:40:56 PM (20 years ago)

Author:

jhoblitt

Message:

print got/expected on ok_str() failure

File:

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

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

@@ -30 +30 @@
 ok((fabsl((VALUE)-(EXPECT)) < (TOL)), COMMENT, ## __VA_ARGS__);
 
-# define ok_str(VALUE,EXPECT,COMMENT, ...)\
-ok(strcmp(VALUE, EXPECT) == 0, COMMENT, ## __VA_ARGS__);
+# define ok_str(VALUE, EXPECT, COMMENT, ...) \
+{ \
+    int cmp = (strcmp(VALUE, EXPECT) == 0); \
+    ok(cmp, COMMENT, ## __VA_ARGS__); \
+    if (!cmp) { \
+        diag("         got: '%s'", VALUE); \
+        diag("    expected: '%s'", EXPECT); \
+    } \
+}
 
 # define ok_strn(VALUE,EXPECT,N,COMMENT, ...)\
@@ -54 +61 @@
 ok((fabsl((VALUE)-(EXPECT)) < )(TOL)), __VA_ARGS__);
 
-# define ok_str(VALUE,EXPECT, ...)\
-ok(strcmp(VALUE, EXPECT) == 0, __VA_ARGS__);
+# define ok_str(VALUE, EXPECT, COMMENT, ...) \
+{ \
+    int cmp = (strcmp(VALUE, EXPECT) == 0); \
+    ok(cmp, COMMENT,  __VA_ARGS__); \
+    if (!cmp) { \
+        diag("         got: '%s'", VALUE); \
+        diag("    expected: '%s'", EXPECT); \
+    } \
+}
 
 # define ok_strn(VALUE,EXPECT,N, ...)\