diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-10-12 05:45:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-12 05:45:06 +0000 |
| commit | 89367372f33cc4cd383c094d7f22e9b7ffeed750 (patch) | |
| tree | d7a0a8c02456624610523e11dcbcc404f92c32df | |
| parent | f5214e3f1a0a05e728cdbafebe522f329ad00325 (diff) | |
| parent | 7c95cc3ed23573fc5c055e3cf7f43616b14e197f (diff) | |
| download | tests-89367372f33cc4cd383c094d7f22e9b7ffeed750.tar.gz | |
net-test: after UML finishes, reenable tty option 'NL' means 'CR+NL' am: 7c95cc3ed2
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1853156
Change-Id: I0e715569693b598cab49b02e5448b7a6f79dd262
| -rwxr-xr-x | net/test/run_net_test.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh index 06e0331..9dca4fe 100755 --- a/net/test/run_net_test.sh +++ b/net/test/run_net_test.sh @@ -347,6 +347,11 @@ if [ "$ARCH" == "um" ]; then $blockdevice=$ROOTFS $netconfig $consolemode ssl3=null,fd:3 $cmdline \ || exitcode=$? + # Return to beginning of line (via carriage return) after the above newline moved us down. + echo -en '\r' + # re-enable: 'postprocess output' and 'translate newline to carriage return-newline' + stty opost onlcr || : + if [[ "${exitcode}" == 134 && -s "${SSL3}" && "$(tr -d '\r' < "${SSL3}")" == 0 ]]; then # Sometimes the tests all pass, but UML crashes during the shutdown process itself. # As such we can't actually rely on the /proc/exitcode returned value. |