Changeset 9b20126 in mainline for uspace/lib/pcut/src/os/generic.c

Timestamp:

2014-09-19T08:23:01Z (11 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/src/os/generic.c (modified) (4 diffs)

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

@@ -33 +33 @@
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -50 +51 @@
 /* Format the command to launch a test according to OS we are running on. */
 
-#if defined(__WIN64) || defined(__WIN32)
+#if defined(__WIN64) || defined(__WIN32) || defined(_WIN32)
 #include <process.h>
 
@@ -108 +109 @@
  */
 void pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
+        int rc;
+        FILE *tempfile;
+        char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
+        char command[PCUT_COMMAND_LINE_BUFFER_SIZE];
+
         before_test_start(test);
 
-        char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
         FORMAT_TEMP_FILENAME(tempfile_name, PCUT_TEMP_FILENAME_BUFFER_SIZE - 1);
-
-        char command[PCUT_COMMAND_LINE_BUFFER_SIZE];
         FORMAT_COMMAND(command, PCUT_COMMAND_LINE_BUFFER_SIZE - 1,
                 self_path, (test)->id, tempfile_name);
+        
+        PCUT_DEBUG("Will execute <%s> (temp file <%s>) with system().",
+                command, tempfile_name);
 
-        int rc = system(command);
+        rc = system(command);
+
+        PCUT_DEBUG("system() returned 0x%04X", rc);
+
         rc = convert_wait_status_to_outcome(rc);
 
-        FILE *tempfile = fopen(tempfile_name, "rb");
+        tempfile = fopen(tempfile_name, "rb");
         if (tempfile == NULL) {
                 pcut_report_test_done(test, TEST_OUTCOME_ERROR, "Failed to open temporary file.", NULL, NULL);
@@ -133 +142 @@
 }
 
+void pcut_hook_before_test(pcut_item_t *test) {
+        PCUT_UNUSED(test);
+
+        /* Do nothing. */
+}
+