Changeset 9b20126 in mainline for uspace/lib/pcut/src/report/xml.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/report/xml.c (modified) (9 diffs)

uspace/lib/pcut/src/report/xml.c

@@ -53 +53 @@
  */
 static void xml_init(pcut_item_t *all_items) {
-        printf("<?xml version=\"1.0\"?>\n");
-
         int tests_total = pcut_count_tests(all_items);
         test_counter = 0;
 
+        printf("<?xml version=\"1.0\"?>\n");
         printf("<report tests-total=\"%d\">\n", tests_total);
 }
@@ -69 +68 @@
         failed_tests_in_suite = 0;
 
-        printf("\t<suite name=\"%s\">\n", suite->suite.name);
+        printf("\t<suite name=\"%s\">\n", suite->name);
 }
 
@@ -77 +76 @@
  */
 static void xml_suite_done(pcut_item_t *suite) {
-        printf("\t</suite><!-- %s: %d / %d -->\n", suite->suite.name,
+        printf("\t</suite><!-- %s: %d / %d -->\n", suite->name,
                 failed_tests_in_suite, tests_in_suite);
 }
@@ -100 +99 @@
  */
 static void print_by_lines(const char *message, const char *element_name) {
+        char *next_line_start;
+
         if ((message == NULL) || (message[0] == 0)) {
                 return;
@@ -106 +107 @@
         printf("\t\t\t<%s><![CDATA[", element_name);
 
-        char *next_line_start = pcut_str_find_char(message, '\n');
+        next_line_start = pcut_str_find_char(message, '\n');
         while (next_line_start != NULL) {
                 next_line_start[0] = 0;
@@ -131 +132 @@
                 const char *error_message, const char *teardown_error_message,
                 const char *extra_output) {
-        const char *test_name = test->test.name;
+        const char *test_name = test->name;
+        const char *status_str = NULL;
 
         if (outcome != TEST_OUTCOME_PASS) {
@@ -137 +139 @@
         }
 
-        const char *status_str = NULL;
         switch (outcome) {
         case TEST_OUTCOME_PASS:
@@ -165 +166 @@
 
 /** Report testing done. */
-static void xml_done() {
+static void xml_done(void) {
         printf("</report>\n");
 }
@@ -171 +172 @@
 
 pcut_report_ops_t pcut_report_xml = {
-        .init = xml_init,
-        .done = xml_done,
-        .suite_start = xml_suite_start,
-        .suite_done = xml_suite_done,
-        .test_start = xml_test_start,
-        .test_done = xml_test_done
+        xml_init, xml_done,
+        xml_suite_start, xml_suite_done,
+        xml_test_start, xml_test_done
 };