diff options
| author | Edward Liaw <edliaw@google.com> | 2024-02-29 06:49:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 06:49:01 +0000 |
| commit | 58a527d9394c64210732cb3f1a17dab458e15523 (patch) | |
| tree | f74b010ad8edb89b855ae0e48ebdaa0a4a997fbd /testcases/network/xinetd/xinetd_tests.sh | |
| parent | 148971c1c4d67c42d5c95013a56539e08dcebbde (diff) | |
| parent | 1470d306139c8cef017d97095952c47c7b06c2a8 (diff) | |
| download | ltp-58a527d9394c64210732cb3f1a17dab458e15523.tar.gz | |
Merge tag '20240129' am: 1470d30613
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/2983197
Change-Id: I0100ddfad10fd2864e7e0d5c9b3d07e371f1998a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'testcases/network/xinetd/xinetd_tests.sh')
| -rwxr-xr-x | testcases/network/xinetd/xinetd_tests.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh index 505dae5d7..25ec91d26 100755 --- a/testcases/network/xinetd/xinetd_tests.sh +++ b/testcases/network/xinetd/xinetd_tests.sh @@ -91,9 +91,10 @@ xinetd_test() for a in $check_addr; do p=$(echo $pattern | sed "s/ADDR/$a/") - echo '' | telnet $a 2>&1 | grep -qiE "$p" - [ $? -ne 0 ] && \ - tst_brk TFAIL "not expected output for 'telnet $a'" + if ! echo '' | telnet $a 2>&1 | grep -qiE "$p"; then + tst_res TFAIL "not expected output for 'telnet $a'" + return + fi done tst_res TPASS "expected output with telnet $desc" } |