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

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

Location:

uspace/lib/pcut/src/os

Files:

• generic.c (modified) (4 diffs)
• helenos.c (modified) (3 diffs)
• unix.c (modified) (4 diffs)
• windows.c (added)

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. */
+}
+

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

@@ -185 +185 @@
         int status = TEST_OUTCOME_PASS;
 
-        int rc = task_spawnvf(&test_task_id, self_path, arguments, files);
+        task_wait_t test_task_wait;
+        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments, files);
         if (rc != EOK) {
                 status = TEST_OUTCOME_ERROR;
@@ -203 +204 @@
         task_exit_t task_exit;
         int task_retval;
-        rc = task_wait(test_task_id, &task_exit, &task_retval);
+        rc = task_wait(&test_task_wait, &task_exit, &task_retval);
         if (rc != EOK) {
                 status = TEST_OUTCOME_ERROR;
@@ -227 +228 @@
         pcut_report_test_done_unparsed(test, status, extra_output_buffer, OUTPUT_BUFFER_SIZE);
 }
+
+void pcut_hook_before_test(pcut_item_t *test) {
+        PCUT_UNUSED(test);
+
+        /* Do nothing. */
+}

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

@@ -32 +32 @@
  */
 
-/** We need _POSX_SOURCE because of kill(). */
+/** We need _POSIX_SOURCE because of kill(). */
 #define _POSIX_SOURCE
+/** We need _BSD_SOURCE because of snprintf() when compiling under C89. */
+#define _BSD_SOURCE
 #include <stdlib.h>
 #include <unistd.h>
@@ -137 +139 @@
  */
 void pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
+        int link_stdout[2], link_stderr[2];
+        int rc, status;
+        size_t stderr_size;
+
         PCUT_UNUSED(self_path);
 
         before_test_start(test);
 
-        int link_stdout[2], link_stderr[2];
-
-        int rc = pipe(link_stdout);
+
+        rc = pipe(link_stdout);
         if (rc == -1) {
                 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,
@@ -184 +189 @@
         alarm(pcut_get_test_timeout(test));
 
-        size_t stderr_size = read_all(link_stderr[0], extra_output_buffer, OUTPUT_BUFFER_SIZE - 1);
+        stderr_size = read_all(link_stderr[0], extra_output_buffer, OUTPUT_BUFFER_SIZE - 1);
         read_all(link_stdout[0], extra_output_buffer, OUTPUT_BUFFER_SIZE - 1 - stderr_size);
 
-        int status;
         wait(&status);
         alarm(0);
@@ -204 +208 @@
         pcut_report_test_done_unparsed(test, rc, extra_output_buffer, OUTPUT_BUFFER_SIZE);
 }
+
+void pcut_hook_before_test(pcut_item_t *test) {
+        PCUT_UNUSED(test);
+
+        /* Do nothing. */
+}
+