Changeset 4b54bd9 in mainline for uspace/lib/pcut/src/os/unix.c
- Timestamp:
- 2018-09-12T13:23:03Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3da0ee4
- Parents:
- 275530a4
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/pcut/src/os/unix.c
r275530a4 r4b54bd9 64 64 * @param test Test that is about to be run. 65 65 */ 66 static void before_test_start(pcut_item_t *test) 67 { 66 static void before_test_start(pcut_item_t *test) { 68 67 pcut_report_test_start(test); 69 68 … … 79 78 * @param sig Signal number. 80 79 */ 81 static void kill_child_on_alarm(int sig) 82 { 80 static void kill_child_on_alarm(int sig) { 83 81 PCUT_UNUSED(sig); 84 82 kill(child_pid, SIGKILL); … … 96 94 * @return Number of actually read bytes. 97 95 */ 98 static size_t read_all(int fd, char *buffer, size_t buffer_size) 99 { 96 static size_t read_all(int fd, char *buffer, size_t buffer_size) { 100 97 ssize_t actually_read; 101 98 char *buffer_start = buffer; … … 124 121 * @return Test outcome code. 125 122 */ 126 static int convert_wait_status_to_outcome(int status) 127 { 123 static int convert_wait_status_to_outcome(int status) { 128 124 if (WIFEXITED(status)) { 129 125 if (WEXITSTATUS(status) != 0) { … … 146 142 * @param test Test to be run. 147 143 */ 148 int pcut_run_test_forking(const char *self_path, pcut_item_t *test) 149 { 144 int pcut_run_test_forking(const char *self_path, pcut_item_t *test) { 150 145 int link_stdout[2], link_stderr[2]; 151 146 int rc, status, outcome; … … 159 154 rc = pipe(link_stdout); 160 155 if (rc == -1) { 161 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,162 156 pcut_snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1, 157 "pipe() failed: %s.", strerror(rc)); 163 158 pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, error_message_buffer, NULL, NULL); 164 159 return PCUT_OUTCOME_INTERNAL_ERROR; … … 166 161 rc = pipe(link_stderr); 167 162 if (rc == -1) { 168 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,169 163 pcut_snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1, 164 "pipe() failed: %s.", strerror(rc)); 170 165 pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, error_message_buffer, NULL, NULL); 171 166 return PCUT_OUTCOME_INTERNAL_ERROR; … … 174 169 child_pid = fork(); 175 170 if (child_pid == (pid_t)-1) { 176 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,177 171 pcut_snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1, 172 "fork() failed: %s.", strerror(rc)); 178 173 outcome = PCUT_OUTCOME_INTERNAL_ERROR; 179 174 goto leave_close_pipes; … … 220 215 } 221 216 222 void pcut_hook_before_test(pcut_item_t *test) 223 { 217 void pcut_hook_before_test(pcut_item_t *test) { 224 218 PCUT_UNUSED(test); 225 219
Note:
See TracChangeset
for help on using the changeset viewer.