Changes in / [bc417660:76ec309b] in mainline

Location:

uspace/lib

Files:

• c/include/string.h (modified) (1 diff)
• pcut/src/report/tap.c (modified) (4 diffs)

uspace/lib/c/include/string.h

@@ -64 +64 @@
 extern size_t strlen(const char *);
 
-#if defined(_HELENOS_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_LIBC_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_LIBC_SOURCE)
 extern size_t strnlen(const char *, size_t);
 extern char *strdup(const char *);

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

@@ -35 +35 @@
 #include "report.h"
 
-#ifdef __helenos__
-#define _REALLY_WANT_STRING_H
+#ifndef __helenos__
+#pragma warning(push, 0)
+#include <string.h>
+#pragma warning(pop)
 #endif
 
 #pragma warning(push, 0)
-#include <string.h>
 #include <stdio.h>
 #pragma warning(pop)
@@ -56 +57 @@
 /** Counter of failed tests in current suite. */
 static int failed_tests_in_suite;
-
-/** Comma-separated list of failed test names. */
-static char *failed_test_names;
 
 /** Initialize the TAP output.
@@ -172 +170 @@
 
         print_by_lines(extra_output, "# stdio: ");
-
-        if (outcome != PCUT_OUTCOME_PASS) {
-                if (failed_test_names == NULL) {
-                        failed_test_names = strdup(test_name);
-                } else {
-                        char *fs = NULL;
-                        if (asprintf(&fs, "%s, %s",
-                            failed_test_names, test_name) >= 0) {
-                                free(failed_test_names);
-                                failed_test_names = fs;
-                        }
-                }
-        }
 }
 
@@ -193 +178 @@
         } else {
                 printf("#> Done: %d of %d tests failed.\n", failed_test_counter, test_counter);
-                printf("#> Failed tests: %s\n", failed_test_names);
         }
 }