diff mbox

[kvm-unit-tests,v4,10/13] run_tests: log stderr

Message ID 1462984243-5783-1-git-send-email-rkrcmar@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Radim Krčmář May 11, 2016, 4:30 p.m. UTC
Summary should provide all important information.

Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com>
---
 v4: new

 run_tests.sh            | 1 +
 scripts/mkstandalone.sh | 1 +
 scripts/runtime.bash    | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

Comments

Andrew Jones May 11, 2016, 5:11 p.m. UTC | #1
On Wed, May 11, 2016 at 06:30:40PM +0200, Radim Kr?má? wrote:
> Summary should provide all important information.
> 
> Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com>
> ---
>  v4: new
> 
>  run_tests.sh            | 1 +
>  scripts/mkstandalone.sh | 1 +
>  scripts/runtime.bash    | 3 ++-
>  3 files changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Andrew Jones <drjones@redhat.com>

> 
> diff --git a/run_tests.sh b/run_tests.sh
> index b634e472a834..254129d8723c 100755
> --- a/run_tests.sh
> +++ b/run_tests.sh
> @@ -46,6 +46,7 @@ while getopts "g:hv" opt; do
>      esac
>  done
>  
> +RUNTIME_log_stderr () { cat >> test.log; }
>  RUNTIME_log_stdout () {
>      if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then
>          ./scripts/pretty_print_stacks.py $1 >> test.log
> diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
> index 77793fd64c76..d2bae1922f4b 100755
> --- a/scripts/mkstandalone.sh
> +++ b/scripts/mkstandalone.sh
> @@ -70,6 +70,7 @@ generate_test ()
>  
>  	echo "exec {stdout}>&1"
>  	echo "RUNTIME_log_stdout () { cat >&\$stdout; }"
> +	echo "RUNTIME_log_stderr () { cat >&2; }"
>  
>  	cat scripts/runtime.bash
>  
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index 6d9d8bffb82f..deae077e50a1 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -55,7 +55,8 @@ function run()
>  
>      # extra_params in the config file may contain backticks that need to be
>      # expanded, so use eval to start qemu.  Same for $RUNTIME_log_stdout.
> -    summary=$(eval $cmdline > >(tee >(RUNTIME_log_stdout $kernel) | extract_summary))
> +    summary=$(eval $cmdline 2> >(RUNTIME_log_stderr) \
> +                             > >(tee >(RUNTIME_log_stdout $kernel) | extract_summary))
>      ret=$?
>  
>      if [ $ret -eq 0 ]; then
> -- 
> 2.8.2
> 
> --
> 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
diff mbox

Patch

diff --git a/run_tests.sh b/run_tests.sh
index b634e472a834..254129d8723c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -46,6 +46,7 @@  while getopts "g:hv" opt; do
     esac
 done
 
+RUNTIME_log_stderr () { cat >> test.log; }
 RUNTIME_log_stdout () {
     if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then
         ./scripts/pretty_print_stacks.py $1 >> test.log
diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
index 77793fd64c76..d2bae1922f4b 100755
--- a/scripts/mkstandalone.sh
+++ b/scripts/mkstandalone.sh
@@ -70,6 +70,7 @@  generate_test ()
 
 	echo "exec {stdout}>&1"
 	echo "RUNTIME_log_stdout () { cat >&\$stdout; }"
+	echo "RUNTIME_log_stderr () { cat >&2; }"
 
 	cat scripts/runtime.bash
 
diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index 6d9d8bffb82f..deae077e50a1 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -55,7 +55,8 @@  function run()
 
     # extra_params in the config file may contain backticks that need to be
     # expanded, so use eval to start qemu.  Same for $RUNTIME_log_stdout.
-    summary=$(eval $cmdline > >(tee >(RUNTIME_log_stdout $kernel) | extract_summary))
+    summary=$(eval $cmdline 2> >(RUNTIME_log_stderr) \
+                             > >(tee >(RUNTIME_log_stdout $kernel) | extract_summary))
     ret=$?
 
     if [ $ret -eq 0 ]; then