| Message ID | 1314732256-6113-1-git-send-email-penberg@kernel.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Tue, Aug 30, 2011 at 12:24 PM, Pekka Enberg <penberg@kernel.org> wrote: > - > - echo " TEST $test_name ($file)" > + if test -t 1; then > + printf "\r TEST %-80s" "$file ($test_name)" > + else > + echo " TEST $test_name ($file)" > + fi Can you test the terminal once and save the result to a local variable? There is no need to run the test over and over again for every line of output. > if [ "$?" -ne "0" ]; then > + echo "" Please just echo. Empty argument is not necessary. Also, shouldn't this wrap by "if terminial" test as well? You are adding new lines for non terminal case. > error "actual $stream text does not match expected $stream text." > error "see $file.$stream.* for further investigation." > cat "$file".$stream.diff > @@ -163,6 +167,7 @@ do_test_suite() > > # prints some numbers > tests_nr=`expr $ok_tests + $ko_tests` > + echo "" Same here. Chris -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/validation/test-suite b/validation/test-suite index 3c011c6..543a94a 100755 --- a/validation/test-suite +++ b/validation/test-suite @@ -94,8 +94,11 @@ do_test() return 2 fi test_name=$last_result - - echo " TEST $test_name ($file)" + if test -t 1; then + printf "\r TEST %-80s" "$file ($test_name)" + else + echo " TEST $test_name ($file)" + fi # does the test provide a specific command ? cmd=`eval echo $default_path/$default_cmd` @@ -128,6 +131,7 @@ do_test() for stream in output error; do diff -u "$file".$stream.expected "$file".$stream.got > "$file".$stream.diff if [ "$?" -ne "0" ]; then + echo "" error "actual $stream text does not match expected $stream text." error "see $file.$stream.* for further investigation." cat "$file".$stream.diff @@ -163,6 +167,7 @@ do_test_suite() # prints some numbers tests_nr=`expr $ok_tests + $ko_tests` + echo "" echo -n "Out of $tests_nr tests, $ok_tests passed, $ko_tests failed" echo " ($known_ko_tests of them are known to fail)" if [ "$unhandled_tests" -ne "0" ]; then
There's more than 100 tests in the validation test suite. That makes it cumbersome to notice test breakage in because the results don't fit on single page. We don't expect to see most tests to pass so it's much more convenient to only be verbose for failing test cases. This patch changes the 'test-suite' output to report progress on a single line unless a test case fails. Current master 'make check' output looks as follows: Makefile:53: Your system does not have libxml, disabling c2xml TEST preprocessor/preprocessor14.c ( Preprocessor #14) error: actual output text does not match expected output text. error: see preprocessor/preprocessor14.c.output.* for further investigation. --- preprocessor/preprocessor14.c.output.expected 2011-08-26 05:47:22.000000000 +0000 +++ preprocessor/preprocessor14.c.output.got 2011-08-26 05:47:22.000000000 +0000 @@ -1,2 +1,2 @@ - +, info: test 'preprocessor/preprocessor14.c' is known to fail TEST static-forward-decl.c ( static forward declaration) error: actual error text does not match expected error text. error: see static-forward-decl.c.error.* for further investigation. --- static-forward-decl.c.error.expected 2011-08-26 05:47:22.000000000 +0000 +++ static-forward-decl.c.error.got 2011-08-26 05:47:22.000000000 +0000 @@ -0,0 +1 @@ +static-forward-decl.c:3:5: warning: symbol 'f' was not declared. Should it be static? info: test 'static-forward-decl.c' is known to fail TEST varargs1.c ( Varargs bogus warning regression test #1) Out of 102 tests, 100 passed, 2 failed (2 of them are known to fail) Cc: Ben Pfaff <blp@cs.stanford.edu> Cc: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Cc: Christopher Li <sparse@chrisli.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Pekka Enberg <penberg@kernel.org> --- - v1 -> v2: Fix non-terminal output formatting validation/test-suite | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)