Message ID | 1450374823-7648-11-git-send-email-rkrcmar@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Dec 17, 2015 at 06:53:41PM +0100, Radim Kr?má? wrote: > Might be interesting and hopefully won't break too many scripts. > > Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> > --- > v2: > - don't print "0 unexpected failures" in run_tests' summary. [Drew] > (This could have been done in lib/report, but I'm not sure why we want > to always print it in the summary, so I've kept it there.) > - use $testname > - don't buffer the output (a serious bug in v1) > - worse performance (reads the output of all tests) > > run_tests.sh | 1 + > scripts/mkstandalone.sh | 2 ++ > scripts/run.bash | 5 ++++- > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/run_tests.sh b/run_tests.sh > index e09d410beaa4..62c106a0b693 100755 > --- a/run_tests.sh > +++ b/run_tests.sh > @@ -30,6 +30,7 @@ EOF > > __run() { ./$TEST_DIR-run "${@}"; } > __eval_log() { eval "${@}" >> test.log; } > +__echo_last_log() { cat test.log; } # XXX: ignores the 'last' bit > > echo > test.log > > diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh > index 778383077769..c37f694398b8 100755 > --- a/scripts/mkstandalone.sh > +++ b/scripts/mkstandalone.sh > @@ -104,7 +104,9 @@ __run() > \$qemu \$cmdline -smp $smp $opts > } > > +# log goes to stdout and nothing is remembered > __eval_log() { eval "\${@}"; } > +__echo_last_log() { echo; } > > run `escape "${@}"` > exit \$? > diff --git a/scripts/run.bash b/scripts/run.bash > index f532cb9e8b1c..d3e8d37d315d 100644 > --- a/scripts/run.bash > +++ b/scripts/run.bash > @@ -46,7 +46,10 @@ function run() > *) echo -ne "\e[31mFAIL\e[0m" > esac > > - echo " $1" > + echo -n " $testname" > + > + __echo_last_log | sed 'x;$s/^SUMMARY: //;ta;$s/.*//p;d; > + :a s/, 0 unexpected failures//;s/^/ (/;s/$/)/' This sed is way beyond my skillz. I would have just done the following at the expense of an extra pipe :-) tac test.log | grep -m1 '^SUMMARY:' | sed 's/.*: \(.*\),.*/\1/' > > return $ret > } > -- > 2.6.4 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Dec 17, 2015 at 06:53:41PM +0100, Radim Kr?má? wrote: > Might be interesting and hopefully won't break too many scripts. > > Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> > --- > v2: > - don't print "0 unexpected failures" in run_tests' summary. [Drew] > (This could have been done in lib/report, but I'm not sure why we want > to always print it in the summary, so I've kept it there.) I vote we kill it in lib/report. It's usually just noise. drew -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2015-12-17 13:55-0600, Andrew Jones: > On Thu, Dec 17, 2015 at 06:53:41PM +0100, Radim Kr?má? wrote: >> Might be interesting and hopefully won't break too many scripts. >> >> Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> >> --- >> v2: >> - don't print "0 unexpected failures" in run_tests' summary. [Drew] >> (This could have been done in lib/report, but I'm not sure why we want >> to always print it in the summary, so I've kept it there.) >> - use $testname >> - don't buffer the output (a serious bug in v1) >> - worse performance (reads the output of all tests) >> >> diff --git a/run_tests.sh b/run_tests.sh >> + __echo_last_log | sed 'x;$s/^SUMMARY: //;ta;$s/.*//p;d; >> + :a s/, 0 unexpected failures//;s/^/ (/;s/$/)/' > > This sed is way beyond my skillz. I would have just done the following > at the expense of an extra pipe :-) > > tac test.log | grep -m1 '^SUMMARY:' | sed 's/.*: \(.*\),.*/\1/' This won't print a newline in case there is no summary, but yeah, I will limit myself to the well known 's' command. (tail won't buffer the whole file and `head` instead of -m is POSIX.) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2015-12-17 14:06-0600, Andrew Jones: > On Thu, Dec 17, 2015 at 06:53:41PM +0100, Radim Kr?má? wrote: >> Might be interesting and hopefully won't break too many scripts. >> >> Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> >> --- >> v2: >> - don't print "0 unexpected failures" in run_tests' summary. [Drew] >> (This could have been done in lib/report, but I'm not sure why we want >> to always print it in the summary, so I've kept it there.) > > I vote we kill it in lib/report. It's usually just noise. I support this. -- To unsubscribe from this list: send the line "unsubscribe kvm" 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/run_tests.sh b/run_tests.sh index e09d410beaa4..62c106a0b693 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -30,6 +30,7 @@ EOF __run() { ./$TEST_DIR-run "${@}"; } __eval_log() { eval "${@}" >> test.log; } +__echo_last_log() { cat test.log; } # XXX: ignores the 'last' bit echo > test.log diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh index 778383077769..c37f694398b8 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -104,7 +104,9 @@ __run() \$qemu \$cmdline -smp $smp $opts } +# log goes to stdout and nothing is remembered __eval_log() { eval "\${@}"; } +__echo_last_log() { echo; } run `escape "${@}"` exit \$? diff --git a/scripts/run.bash b/scripts/run.bash index f532cb9e8b1c..d3e8d37d315d 100644 --- a/scripts/run.bash +++ b/scripts/run.bash @@ -46,7 +46,10 @@ function run() *) echo -ne "\e[31mFAIL\e[0m" esac - echo " $1" + echo -n " $testname" + + __echo_last_log | sed 'x;$s/^SUMMARY: //;ta;$s/.*//p;d; + :a s/, 0 unexpected failures//;s/^/ (/;s/$/)/' return $ret }
Might be interesting and hopefully won't break too many scripts. Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> --- v2: - don't print "0 unexpected failures" in run_tests' summary. [Drew] (This could have been done in lib/report, but I'm not sure why we want to always print it in the summary, so I've kept it there.) - use $testname - don't buffer the output (a serious bug in v1) - worse performance (reads the output of all tests) run_tests.sh | 1 + scripts/mkstandalone.sh | 2 ++ scripts/run.bash | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-)