Changeset 1433ecda in mainline for uspace/lib/pcut/src/report
- Timestamp:
- 2018-04-04T15:42:37Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 2c4e1cc
- Parents:
- 47b2d7e3
- Location:
- uspace/lib/pcut/src/report
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/pcut/src/report/report.c
r47b2d7e3 r1433ecda 67 67 * @param msg The message to be printed. 68 68 */ 69 void pcut_print_fail_message(const char *msg) { 69 void pcut_print_fail_message(const char *msg) 70 { 70 71 if (msg == NULL) { 71 72 return; … … 97 98 */ 98 99 static void parse_command_output(const char *full_output, size_t full_output_size, 99 char *stdio_buffer, size_t stdio_buffer_size, 100 char *error_buffer, size_t error_buffer_size) { 100 char *stdio_buffer, size_t stdio_buffer_size, 101 char *error_buffer, size_t error_buffer_size) 102 { 101 103 memset(stdio_buffer, 0, stdio_buffer_size); 102 104 memset(error_buffer, 0, error_buffer_size); … … 154 156 * @param ops Functions to use. 155 157 */ 156 void pcut_report_register_handler(pcut_report_ops_t *ops) { 158 void pcut_report_register_handler(pcut_report_ops_t *ops) 159 { 157 160 report_ops = ops; 158 161 } … … 162 165 * @param all_items List of all tests that could be run. 163 166 */ 164 void pcut_report_init(pcut_item_t *all_items) { 167 void pcut_report_init(pcut_item_t *all_items) 168 { 165 169 REPORT_CALL(init, all_items); 166 170 } … … 170 174 * @param suite Suite that was just started. 171 175 */ 172 void pcut_report_suite_start(pcut_item_t *suite) { 176 void pcut_report_suite_start(pcut_item_t *suite) 177 { 173 178 REPORT_CALL(suite_start, suite); 174 179 } … … 178 183 * @param suite Suite that just completed. 179 184 */ 180 void pcut_report_suite_done(pcut_item_t *suite) { 185 void pcut_report_suite_done(pcut_item_t *suite) 186 { 181 187 REPORT_CALL(suite_done, suite); 182 188 } … … 186 192 * @param test Test to be run just about now. 187 193 */ 188 void pcut_report_test_start(pcut_item_t *test) { 194 void pcut_report_test_start(pcut_item_t *test) 195 { 189 196 REPORT_CALL(test_start, test); 190 197 } … … 199 206 */ 200 207 void pcut_report_test_done(pcut_item_t *test, int outcome, 201 const char *error_message, const char *teardown_error_message, 202 const char *extra_output) { 208 const char *error_message, const char *teardown_error_message, 209 const char *extra_output) 210 { 203 211 REPORT_CALL(test_done, test, outcome, error_message, teardown_error_message, 204 extra_output);212 extra_output); 205 213 } 206 214 … … 213 221 */ 214 222 void pcut_report_test_done_unparsed(pcut_item_t *test, int outcome, 215 const char *unparsed_output, size_t unparsed_output_size) { 223 const char *unparsed_output, size_t unparsed_output_size) 224 { 216 225 217 226 parse_command_output(unparsed_output, unparsed_output_size, 218 buffer_for_extra_output, BUFFER_SIZE,219 buffer_for_error_messages, BUFFER_SIZE);227 buffer_for_extra_output, BUFFER_SIZE, 228 buffer_for_error_messages, BUFFER_SIZE); 220 229 221 230 pcut_report_test_done(test, outcome, buffer_for_error_messages, NULL, buffer_for_extra_output); … … 225 234 * 226 235 */ 227 void pcut_report_done(void) { 236 void pcut_report_done(void) 237 { 228 238 REPORT_CALL_NO_ARGS(done); 229 239 } -
uspace/lib/pcut/src/report/tap.c
r47b2d7e3 r1433ecda 55 55 * @param all_items Start of the list with all items. 56 56 */ 57 static void tap_init(pcut_item_t *all_items) { 57 static void tap_init(pcut_item_t *all_items) 58 { 58 59 int tests_total = pcut_count_tests(all_items); 59 60 test_counter = 0; … … 67 68 * @param suite Suite that just started. 68 69 */ 69 static void tap_suite_start(pcut_item_t *suite) { 70 static void tap_suite_start(pcut_item_t *suite) 71 { 70 72 tests_in_suite = 0; 71 73 failed_tests_in_suite = 0; … … 78 80 * @param suite Suite that just ended. 79 81 */ 80 static void tap_suite_done(pcut_item_t *suite) { 82 static void tap_suite_done(pcut_item_t *suite) 83 { 81 84 if (failed_tests_in_suite == 0) { 82 85 printf("#> Finished suite %s (passed).\n", 83 suite->name);86 suite->name); 84 87 } else { 85 88 printf("#> Finished suite %s (failed %d of %d).\n", 86 suite->name, failed_tests_in_suite, tests_in_suite);89 suite->name, failed_tests_in_suite, tests_in_suite); 87 90 } 88 91 } … … 94 97 * @param test Test that is started. 95 98 */ 96 static void tap_test_start(pcut_item_t *test) { 99 static void tap_test_start(pcut_item_t *test) 100 { 97 101 PCUT_UNUSED(test); 98 102 … … 106 110 * @param prefix Prefix for each new line, such as comment character. 107 111 */ 108 static void print_by_lines(const char *message, const char *prefix) { 112 static void print_by_lines(const char *message, const char *prefix) 113 { 109 114 char *next_line_start; 110 115 if ((message == NULL) || (message[0] == 0)) { … … 132 137 */ 133 138 static void tap_test_done(pcut_item_t *test, int outcome, 134 const char *error_message, const char *teardown_error_message, 135 const char *extra_output) { 139 const char *error_message, const char *teardown_error_message, 140 const char *extra_output) 141 { 136 142 const char *test_name = test->name; 137 143 const char *status_str = NULL; … … 166 172 167 173 /** Report testing done. */ 168 static void tap_done(void) { 174 static void tap_done(void) 175 { 169 176 if (failed_test_counter == 0) { 170 177 printf("#> Done: all tests passed.\n"); -
uspace/lib/pcut/src/report/xml.c
r47b2d7e3 r1433ecda 52 52 * @param all_items Start of the list with all items. 53 53 */ 54 static void xml_init(pcut_item_t *all_items) { 54 static void xml_init(pcut_item_t *all_items) 55 { 55 56 int tests_total = pcut_count_tests(all_items); 56 57 test_counter = 0; … … 64 65 * @param suite Suite that just started. 65 66 */ 66 static void xml_suite_start(pcut_item_t *suite) { 67 static void xml_suite_start(pcut_item_t *suite) 68 { 67 69 tests_in_suite = 0; 68 70 failed_tests_in_suite = 0; … … 75 77 * @param suite Suite that just ended. 76 78 */ 77 static void xml_suite_done(pcut_item_t *suite) { 79 static void xml_suite_done(pcut_item_t *suite) 80 { 78 81 printf("\t</suite><!-- %s: %d / %d -->\n", suite->name, 79 failed_tests_in_suite, tests_in_suite);82 failed_tests_in_suite, tests_in_suite); 80 83 } 81 84 … … 86 89 * @param test Test that is started. 87 90 */ 88 static void xml_test_start(pcut_item_t *test) { 91 static void xml_test_start(pcut_item_t *test) 92 { 89 93 PCUT_UNUSED(test); 90 94 … … 98 102 * @param element_name Wrapping XML element name. 99 103 */ 100 static void print_by_lines(const char *message, const char *element_name) { 104 static void print_by_lines(const char *message, const char *element_name) 105 { 101 106 char *next_line_start; 102 107 … … 130 135 */ 131 136 static void xml_test_done(pcut_item_t *test, int outcome, 132 const char *error_message, const char *teardown_error_message, 133 const char *extra_output) { 137 const char *error_message, const char *teardown_error_message, 138 const char *extra_output) 139 { 134 140 const char *test_name = test->name; 135 141 const char *status_str = NULL; … … 152 158 153 159 printf("\t\t<testcase name=\"%s\" status=\"%s\">\n", test_name, 154 status_str);160 status_str); 155 161 156 162 print_by_lines(error_message, "error-message"); … … 163 169 164 170 /** Report testing done. */ 165 static void xml_done(void) { 171 static void xml_done(void) 172 { 166 173 printf("</report>\n"); 167 174 }
Note:
See TracChangeset
for help on using the changeset viewer.
