Changeset 9b20126 in mainline for uspace/lib/pcut/include/pcut/asserts.h

Timestamp:

2014-09-19T08:23:01Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c85a57f

Parents:

15d0046

Message:

Update PCUT to newest version

File:

• uspace/lib/pcut/include/pcut/asserts.h (modified) (5 diffs)

uspace/lib/pcut/include/pcut/asserts.h

@@ -39 +39 @@
 #include <errno.h>
 
+/** @def PCUT_CURRENT_FILENAME
+ * Overwrite contents of __FILE__ when printing assertion errors.
+ */
+#ifndef PCUT_CURRENT_FILENAME
+#define PCUT_CURRENT_FILENAME __FILE__
+#endif
+
 /** @cond devel */
 
@@ -46 +53 @@
  * (if registered).
  *
+ * @param filename File where the assertion occurred.
+ * @param line Line where the assertion occurred.
  * @param fmt Printf-like format string.
  * @param ... Extra arguments.
  */
-void pcut_failed_assertion_fmt(const char *fmt, ...);
+void pcut_failed_assertion_fmt(const char *filename, int line, const char *fmt, ...);
 
 /** OS-agnostic string comparison.
@@ -70 +79 @@
 void pcut_str_error(int error, char *buffer, int size);
 
+/** Raise assertion error (internal version).
+ *
+ * We expect to be always called from PCUT_ASSERTION_FAILED() where
+ * the last argument is empty string to conform to strict ISO C99
+ * ("ISO C99 requires rest arguments to be used").
+ *
+ * @param fmt Printf-like format string.
+ * @param ... Extra arguments.
+ */
+#define PCUT_ASSERTION_FAILED_INTERNAL(fmt, ...) \
+        pcut_failed_assertion_fmt(PCUT_CURRENT_FILENAME, __LINE__, fmt, __VA_ARGS__)
+
+
 /** @endcond */
 
@@ -77 +99 @@
  * abort (tear-down function of the test suite is run when available).
  *
- * @param fmt Printf-like format string.
- * @param ... Extra arguments.
- */
-#define PCUT_ASSERTION_FAILED(fmt, ...) \
-        pcut_failed_assertion_fmt(__FILE__ ":%d: " fmt, __LINE__, ##__VA_ARGS__)
+ * @param ... Printf-like arguments.
+ */
+#define PCUT_ASSERTION_FAILED(...) \
+        PCUT_ASSERTION_FAILED_INTERNAL(__VA_ARGS__, "")
 
 
@@ -115 +136 @@
  */
 #define PCUT_ASSERT_EQUALS(expected, actual) \
-                do {\
-                        if (!((expected) == (actual))) { \
-                                PCUT_ASSERTION_FAILED("Expected <"#expected "> but got <" #actual ">"); \
-                        } \
-                } while (0)
+        do {\
+                if (!((expected) == (actual))) { \
+                        PCUT_ASSERTION_FAILED("Expected <"#expected "> but got <" #actual ">"); \
+                } \
+        } while (0)
 
 /** Asserts that given pointer is NULL.