Changeset 0f51ca4 in mainline

Timestamp:

2019-02-15T14:08:13Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

098e16a5, fc9167f

Parents:

43dd2d4b

Message:

Update libpcut from upstream

Location:

uspace/lib/pcut

Files:

• Makefile (modified) (1 diff)
• include/pcut/asserts.h (modified) (1 diff)

uspace/lib/pcut/Makefile

@@ -23 +23 @@
         $(PCUT_TEST_PREFIX)testlist$(PCUT_TEST_SUFFIX) \
         $(PCUT_TEST_PREFIX)timeout$(PCUT_TEST_SUFFIX) \
-        $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX) 
+        $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX)
 
 EXTRA_CLEAN = $(SELF_TESTS)

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

@@ -186 +186 @@
 #define PCUT_ASSERT_INT_EQUALS(expected, actual) \
         do {\
-                long pcut_expected_eval = (expected); \
-                long pcut_actual_eval = (actual); \
+                long long pcut_expected_eval = (expected); \
+                long long pcut_actual_eval = (actual); \
                 if (pcut_expected_eval != pcut_actual_eval) { \
-                        PCUT_ASSERTION_FAILED("Expected <%ld> but got <%ld> (%s != %s)", \
+                        PCUT_ASSERTION_FAILED("Expected <%lld> but got <%lld> (%s != %s)", \
                                 pcut_expected_eval, pcut_actual_eval, \
                                 #expected, #actual); \