| Message ID | 20191127002340.10724-1-oohall@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | boottests: Print the simulator output if V=1 is set | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch master (d75e82dbfbb9443efeb3f9a5921ac23605aab469) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
On Wed, Nov 27, 2019 at 11:23 AM Oliver O'Halloran <oohall@gmail.com> wrote: > > Currently we only print it on failures, but sometimes it's nice to see > the output in the successful cases too. > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Merged as 0990e822666b65b50fb577c0389a972637249896
diff --git a/test/hello_world/run_mambo_hello_world.sh b/test/hello_world/run_mambo_hello_world.sh index d3dbf1f211a3..a9f5b8ad9101 100755 --- a/test/hello_world/run_mambo_hello_world.sh +++ b/test/hello_world/run_mambo_hello_world.sh @@ -58,6 +58,7 @@ if [ $r != 0 ]; then exit $r fi +if [ -n "$V" ] ; then cat "$t" ; fi rm -f -- "$t" trap - EXIT exit 0; diff --git a/test/hello_world/run_mambo_p9_hello_world.sh b/test/hello_world/run_mambo_p9_hello_world.sh index 9c304fdffdb7..e9eee8c394fd 100755 --- a/test/hello_world/run_mambo_p9_hello_world.sh +++ b/test/hello_world/run_mambo_p9_hello_world.sh @@ -58,6 +58,7 @@ if [ $r != 0 ]; then exit $r fi +if [ -n "$V" ] ; then cat "$t" ; fi rm -f -- "$t" trap - EXIT exit 0; diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh index 4f12958d9eda..265add84728e 100755 --- a/test/hello_world/run_qemu_hello_world.sh +++ b/test/hello_world/run_qemu_hello_world.sh @@ -50,6 +50,7 @@ if [ $r != 0 ]; then exit $r fi +if [ -n "$V" ] ; then cat "$t" ; fi rm -f -- "$t" trap - EXIT diff --git a/test/run_mambo_boot_test.sh b/test/run_mambo_boot_test.sh index 9899bde466e4..d08d93f9cac6 100755 --- a/test/run_mambo_boot_test.sh +++ b/test/run_mambo_boot_test.sh @@ -65,6 +65,7 @@ if [ $r != 0 ]; then exit $r fi +if [ -n "$V" ] ; then cat "$t" ; fi rm -f -- "$t" trap - EXIT exit 0 diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh index db657eed303b..ee3d9da93148 100755 --- a/test/run_qemu_boot_test.sh +++ b/test/run_qemu_boot_test.sh @@ -55,6 +55,7 @@ if [ $E -eq 3 ]; then exit 0; fi +if [ -n "$V" ] ; then cat "$t" ; fi if [ $E -eq 0 ]; then rm $T else diff --git a/test/sreset_world/run_mambo_p9_sreset.sh b/test/sreset_world/run_mambo_p9_sreset.sh index 4bfa547ba58a..cc19c5849518 100755 --- a/test/sreset_world/run_mambo_p9_sreset.sh +++ b/test/sreset_world/run_mambo_p9_sreset.sh @@ -70,6 +70,7 @@ if [ $r != 0 ]; then exit $r fi +if [ -n "$V" ] ; then cat "$t" ; fi rm -f -- "$t" trap - EXIT exit 0; diff --git a/test/sreset_world/run_mambo_sreset.sh b/test/sreset_world/run_mambo_sreset.sh index 24a8a934a942..298a582f8f9c 100755 --- a/test/sreset_world/run_mambo_sreset.sh +++ b/test/sreset_world/run_mambo_sreset.sh @@ -70,6 +70,7 @@ if [ $r != 0 ]; then exit $r fi +if [ -n "$V" ] ; then cat "$t" ; fi rm -f -- "$t" trap - EXIT exit 0;
Currently we only print it on failures, but sometimes it's nice to see the output in the successful cases too. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- test/hello_world/run_mambo_hello_world.sh | 1 + test/hello_world/run_mambo_p9_hello_world.sh | 1 + test/hello_world/run_qemu_hello_world.sh | 1 + test/run_mambo_boot_test.sh | 1 + test/run_qemu_boot_test.sh | 1 + test/sreset_world/run_mambo_p9_sreset.sh | 1 + test/sreset_world/run_mambo_sreset.sh | 1 + 7 files changed, 7 insertions(+)