With a proper snprintf() implementation in place, the ugly pipe usage is
not necessary anymore.

Signed-off-by: Thomas Weißschuh <thomas.weisssc...@linutronix.de>
---
 tools/testing/selftests/nolibc/nolibc-test.c | 30 +++-------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/tools/testing/selftests/nolibc/nolibc-test.c 
b/tools/testing/selftests/nolibc/nolibc-test.c
index 
6fa659429cfc38c9d42f36f80ab6c529890d9ad7..1b60eb848c02ef4e90782a83e90987b7efb71031
 100644
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -1283,27 +1283,14 @@ int run_stdlib(int min, int max)
 
 static int expect_vfprintf(int llen, int c, const char *expected, const char 
*fmt, ...)
 {
-       int ret, pipefd[2];
-       ssize_t w, r;
        char buf[100];
-       FILE *memfile;
        va_list args;
+       ssize_t w;
+       int ret;
 
-       ret = pipe(pipefd);
-       if (ret == -1) {
-               llen += printf(" pipe() != %s", strerror(errno));
-               result(llen, FAIL);
-               return 1;
-       }
-
-       memfile = fdopen(pipefd[1], "w");
-       if (!memfile) {
-               result(llen, FAIL);
-               return 1;
-       }
 
        va_start(args, fmt);
-       w = vfprintf(memfile, fmt, args);
+       w = vsnprintf(buf, sizeof(buf), fmt, args);
        va_end(args);
 
        if (w != c) {
@@ -1312,17 +1299,6 @@ static int expect_vfprintf(int llen, int c, const char 
*expected, const char *fm
                return 1;
        }
 
-       fclose(memfile);
-
-       r = read(pipefd[0], buf, sizeof(buf) - 1);
-
-       if (r != w) {
-               llen += printf(" written(%d) != read(%d)", (int)w, (int)r);
-               result(llen, FAIL);
-               return 1;
-       }
-
-       buf[r] = '\0';
        llen += printf(" \"%s\" = \"%s\"", expected, buf);
        ret = strncmp(expected, buf, c);
 

-- 
2.48.1


Reply via email to