diff options
| author | Petr Vorel <pvorel@suse.cz> | 2020-05-12 22:14:16 +0200 |
|---|---|---|
| committer | Petr Vorel <pvorel@suse.cz> | 2020-05-15 14:12:05 +0200 |
| commit | 889d1cdfbada47cee2fc466b0dee3df08f5d4f55 (patch) | |
| tree | 933529a956ca1ac96e2c02120a92e1e80831aa27 | |
| parent | e1b7d023c04fd34d279c7af02d054bfd17608bba (diff) | |
rpc: TCONF when tests aren't compiled + remove kill warning
Without this test failure was wrongly reported:
rpc_test 1 TFAIL: tirpc_rpcb_getaddr 10.0.0.2 536875000 failed unexpectedly
Also make sure with variable that server has started before trying to
kill it.
Kill server with SIGPIPE, should be enough and SIGKILL
produced warning, which might be confused:
/opt/ltp/testcases/bin/rpc_test.sh: line 61: 3827 Killed $SERVER $PROGNUMNOSVC
Reviewed-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
| -rwxr-xr-x | testcases/network/rpc/rpc-tirpc/rpc_test.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testcases/network/rpc/rpc-tirpc/rpc_test.sh b/testcases/network/rpc/rpc-tirpc/rpc_test.sh index 30cfd2564..dc97213d0 100755 --- a/testcases/network/rpc/rpc-tirpc/rpc_test.sh +++ b/testcases/network/rpc/rpc-tirpc/rpc_test.sh @@ -54,12 +54,13 @@ setup() fi [ -n "$CLIENT" ] || tst_brk TBROK "client program not set" + tst_check_cmds $CLIENT $SERVER || tst_brk TCONF "LTP compiled without TI-RPC support?" } cleanup() { - if [ ! -z "$SERVER" ]; then - pkill -9 $SERVER > /dev/null 2>&1 + if [ "$SERVER_STARTED" ]; then + pkill -13 -x $SERVER $CLEANER $PROGNUMNOSVC fi } @@ -70,6 +71,7 @@ do_test() if [ -n "$SERVER" ]; then $SERVER $PROGNUMNOSVC & + SERVER_STARTED=1 for i in $(seq 1 10); do rpcinfo -p localhost | grep -q $PROGNUMNOSVC && break |