Skip to contentSkip to conversation

tirpc: Pass all extra client options to client program

PATCH New Xiao Yang 2 participants 3 messages May 20, 2020

lore
Share & tools
lore

Xiao Yang

author
#0 lore raw

PATCH 1/1 tirpc: Pass all extra client options to client program

New rpc_test.sh only passes the first extra client option to
client program if extra client options are two or more.
For example, only "1" is passed into tirpc_rpc_broadcast_exp:
-------------------------------------------
./runltp -f net.tirpc_tests -s tirpc_rpc_broadcast_exp
...
tag=tirpc_rpc_broadcast_exp stime=1589957933
cmdline="rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_broadcast_exp -e "1 2""
...
rpc_test 1 TFAIL: tirpc_rpc_broadcast_exp 10.0.0.2 536875000 1 failed unexpectedly
-------------------------------------------
For extra client options, use comma as a delimiter in net.tirpc_tests and replace it with white space in rpc_test.sh

Fixes 3190368d2df8 ("rpc/rpc_test.sh: Rewrite into new shell API")
---
 runtest/net.tirpc_tests                     | 2 +-
 testcases/network/rpc/rpc-tirpc/rpc_test.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
runtest/net.tirpc_tests +1 -1
index 48e9ba3f5..8aa69ef4d 100644
@@ -38,7 +38,7 @@ tirpc_clnt_control rpc_test.sh -s tirpc_svc_3 -c tirpc_clnt_control
 tirpc_rpc_reg rpc_test.sh -c tirpc_rpc_reg
 tirpc_rpc_call rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_call
 tirpc_rpc_broadcast rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_broadcast
-tirpc_rpc_broadcast_exp rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_broadcast_exp -e "1 2"
+tirpc_rpc_broadcast_exp rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_broadcast_exp -e "1,2"
 
 tirpc_clnt_create rpc_test.sh -s tirpc_svc_2 -c tirpc_clnt_create
 tirpc_clnt_create_timed rpc_test.sh -s tirpc_svc_2 -c tirpc_clnt_create_timed
testcases/network/rpc/rpc-tirpc/rpc_test.sh +1 -1
index dc97213d0..bcefadbdb 100755
@@ -37,7 +37,7 @@ rpc_parse_args()
 {
 	case "$1" in
 		c) CLIENT="$OPTARG" ;;
-		e) CLIENT_EXTRA_OPTS="$OPTARG" ;;
+		e) CLIENT_EXTRA_OPTS="${OPTARG//','/' '}" ;;
 		s) SERVER="$OPTARG" ;;
 	esac
 }
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 tirpc: Pass all extra client options to client program

Hi Yang,

Quoted 14 lines

New rpc_test.sh only passes the first extra client option to
client program if extra client options are two or more.
For example, only "1" is passed into tirpc_rpc_broadcast_exp:
-------------------------------------------
./runltp -f net.tirpc_tests -s tirpc_rpc_broadcast_exp
...
tag=tirpc_rpc_broadcast_exp stime=1589957933
cmdline="rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_broadcast_exp -e "1 2""
...
rpc_test 1 TFAIL: tirpc_rpc_broadcast_exp 10.0.0.2 536875000 1 failed unexpectedly
-------------------------------------------
For extra client options, use comma as a delimiter in net.tirpc_tests and replace it with white space in rpc_test.sh

Quoted 2 lines
Fixes 3190368d2df8 ("rpc/rpc_test.sh: Rewrite into new shell API")

Thanks a lot for a fix!

I replaced bashism in OPTARG handling with sed (otherwise it'd fail on dash) and merged.

Kind regards,
Petr

author
#2 lore raw

PATCH 1/1 tirpc: Pass all extra client options to client program

Quoted 16 lines · Petr Vorel

Hi Yang,

Quoted 13 lines

New rpc_test.sh only passes the first extra client option to
client program if extra client options are two or more.
For example, only "1" is passed into tirpc_rpc_broadcast_exp:
-------------------------------------------
./runltp -f net.tirpc_tests -s tirpc_rpc_broadcast_exp
...
tag=tirpc_rpc_broadcast_exp stime=1589957933
cmdline="rpc_test.sh -s tirpc_svc_1 -c tirpc_rpc_broadcast_exp -e "1 2""
...
rpc_test 1 TFAIL: tirpc_rpc_broadcast_exp 10.0.0.2 536875000 1 failed unexpectedly
-------------------------------------------
For extra client options, use comma as a delimiter in net.tirpc_tests and replace it with white space in rpc_test.sh

Quoted 7 lines
Quoted 2 lines
Fixes 3190368d2df8 ("rpc/rpc_test.sh: Rewrite into new shell API")

Thanks a lot for a fix!

I replaced bashism in OPTARG handling with sed (otherwise it'd fail on dash) and merged.

Hi Petr,

Thanks for your change.
I will avoid bashism next time.

Best Regards,
Xiao Yang

Quoted 7 lines

Kind regards,
Petr

.