Changeset 4b54bd9 in mainline for uspace/lib/pcut/tests/beforeafter.c

Timestamp:

2018-09-12T13:23:03Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

3da0ee4

Parents:

275530a4

Message:

Update PCUT to latest revision

File:

• uspace/lib/pcut/tests/beforeafter.c (modified) (3 diffs)

uspace/lib/pcut/tests/beforeafter.c

@@ -34 +34 @@
 #include <stdio.h>
 
-/*
- * Use sprintf_s in Windows but only with Microsoft compiler.
- * Namely, let MinGW use snprintf.
- */
-#if (defined(__WIN64) || defined(__WIN32) || defined(_WIN32)) && defined(_MSC_VER)
-#define snprintf sprintf_s
-#endif
-
-PCUT_INIT;
+PCUT_INIT
 
 static char *buffer = NULL;
@@ -49 +41 @@
 PCUT_TEST_SUITE(suite_with_setup_and_teardown);
 
-PCUT_TEST_BEFORE
-{
+PCUT_TEST_BEFORE {
         buffer = malloc(BUFFER_SIZE);
         PCUT_ASSERT_NOT_NULL(buffer);
 }
 
-PCUT_TEST_AFTER
-{
+PCUT_TEST_AFTER {
         free(buffer);
         buffer = NULL;
 }
 
-PCUT_TEST(test_with_setup_and_teardown)
-{
+PCUT_TEST(test_with_setup_and_teardown) {
+#if (defined(__WIN64) || defined(__WIN32) || defined(_WIN32)) && defined(_MSC_VER)
+        _snprintf_s(buffer, BUFFER_SIZE - 1, _TRUNCATE, "%d-%s", 56, "abcd");
+#else
         snprintf(buffer, BUFFER_SIZE - 1, "%d-%s", 56, "abcd");
+#endif
+
         PCUT_ASSERT_STR_EQUALS("56-abcd", buffer);
 }
@@ -69 +63 @@
 PCUT_TEST_SUITE(another_without_setup);
 
-PCUT_TEST(test_without_any_setup_or_teardown)
-{
+PCUT_TEST(test_without_any_setup_or_teardown) {
         PCUT_ASSERT_NULL(buffer);
 }
 
 
-PCUT_MAIN();
+PCUT_MAIN()