Fix logic error in setting client port

We need to do this after we possibly added the proxy.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2020-06-25 09:52:54 +02:00
parent e5201e479a
commit 57e328e805

View file

@ -477,13 +477,6 @@ run_test() {
CLI_EXPECT="$3" CLI_EXPECT="$3"
shift 3 shift 3
# fix client port
if [ -n "$PXY_CMD" ]; then
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g )
else
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$SRV_PORT/g )
fi
# update DTLS variable # update DTLS variable
detect_dtls "$SRV_CMD" detect_dtls "$SRV_CMD"
@ -493,6 +486,13 @@ run_test() {
PXY_CMD="$P_PXY" PXY_CMD="$P_PXY"
fi fi
# fix client port
if [ -n "$PXY_CMD" ]; then
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g )
else
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$SRV_PORT/g )
fi
# prepend valgrind to our commands if active # prepend valgrind to our commands if active
if [ "$MEMCHECK" -gt 0 ]; then if [ "$MEMCHECK" -gt 0 ]; then
if is_polar "$SRV_CMD"; then if is_polar "$SRV_CMD"; then