Changeset 4b54bd9 in mainline for uspace/lib/pcut/src/os/generic.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/src/os/generic.c (modified) (9 diffs)

uspace/lib/pcut/src/os/generic.c

@@ -31 +31 @@
  * Platform-dependent test execution function when system() is available.
  */
-
+#pragma warning(push, 0)
 #include <stdlib.h>
 #include <stdio.h>
@@ -38 +38 @@
 #include <assert.h>
 #include <string.h>
+#pragma warning(pop)
+
 #include "../internal.h"
 
@@ -55 +57 @@
 
 #define FORMAT_COMMAND(buffer, buffer_size, self_path, test_id, temp_file) \
-        snprintf(buffer, buffer_size, "\"\"%s\" -t%d >%s\"", self_path, test_id, temp_file)
+        pcut_snprintf(buffer, buffer_size, "\"\"%s\" -t%d >%s\"", self_path, test_id, temp_file)
 #define FORMAT_TEMP_FILENAME(buffer, buffer_size) \
-        snprintf(buffer, buffer_size, "pcut_%d.tmp", _getpid())
+        pcut_snprintf(buffer, buffer_size, "pcut_%d.tmp", _getpid())
 
 #elif defined(__unix)
@@ -63 +65 @@
 
 #define FORMAT_COMMAND(buffer, buffer_size, self_path, test_id, temp_file) \
-        snprintf(buffer, buffer_size, "%s -t%d &>%s", self_path, test_id, temp_file)
+        pcut_snprintf(buffer, buffer_size, "%s -t%d &>%s", self_path, test_id, temp_file)
 #define FORMAT_TEMP_FILENAME(buffer, buffer_size) \
-        snprintf(buffer, buffer_size, "pcut_%d.tmp", getpid())
+        pcut_snprintf(buffer, buffer_size, "pcut_%d.tmp", getpid())
 
 #else
@@ -81 +83 @@
  * @param test Test that is about to start.
  */
-static void before_test_start(pcut_item_t *test)
-{
+static void before_test_start(pcut_item_t *test) {
         pcut_report_test_start(test);
 
@@ -94 +95 @@
  * @return Test outcome code.
  */
-static int convert_wait_status_to_outcome(int status)
-{
+static int convert_wait_status_to_outcome(int status) {
         if (status < 0) {
                 return PCUT_OUTCOME_INTERNAL_ERROR;
@@ -110 +110 @@
  * @param test Test to be run.
  */
-int pcut_run_test_forking(const char *self_path, pcut_item_t *test)
-{
+int pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
         int rc, outcome;
         FILE *tempfile;
@@ -121 +120 @@
         FORMAT_TEMP_FILENAME(tempfile_name, PCUT_TEMP_FILENAME_BUFFER_SIZE - 1);
         FORMAT_COMMAND(command, PCUT_COMMAND_LINE_BUFFER_SIZE - 1,
-            self_path, (test)->id, tempfile_name);
-
+                self_path, (test)->id, tempfile_name);
+        
         PCUT_DEBUG("Will execute <%s> (temp file <%s>) with system().",
-            command, tempfile_name);
+                command, tempfile_name);
 
         rc = system(command);
@@ -147 +146 @@
 }
 
-void pcut_hook_before_test(pcut_item_t *test)
-{
+void pcut_hook_before_test(pcut_item_t *test) {
         PCUT_UNUSED(test);