From adb360072b99fddbec12e68ea38f1dc3a2e4ed7a Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 29 Jan 2014 00:30:12 +0000 Subject: [PATCH] Move all test output to ./testsuite.out, show single line pass/fail --- .gitignore | 1 + tests/testsuite.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d89776e7..7d081ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ runvalgrind.sh src/prof_config.h clean.sh valgrind.out.old +testsuite.out diff --git a/tests/testsuite.c b/tests/testsuite.c index ea9a191e..f60e6d11 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "config/helpers.h" #include "test_autocomplete.h" @@ -421,11 +422,16 @@ int main(int argc, char* argv[]) { close_preferences), }; - int bak, new; + int bak, bak2, new; fflush(stdout); + fflush(stderr); bak = dup(1); - new = open("/dev/null", O_WRONLY); + bak2 = dup(2); + remove("./testsuite.out"); + new = open("./testsuite.out", O_WRONLY | O_CREAT); + chmod("./testsuite.out", S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); dup2(new, 1); + dup2(new, 2); close(new); int result = 0; @@ -448,11 +454,15 @@ int main(int argc, char* argv[]) { fflush(stdout); dup2(bak, 1); + dup2(bak2, 2); close(bak); + close(bak2); if (result > 0) { + printf("\n\nFAILED TESTS, see ./testsuite.out\n\n"); return 1; } else { + printf("\n\nAll tests passed\n\n"); return 0; } }