Skip to contentSkip to conversation

network: fix printing commands in verbose mode

PATCH New Petr Vorel 2 participants 3 messages Dec 8, 2016 – Dec 14, 2016

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 1/2 network: fix printing commands in verbose mode

Copy & paste error from testscripts/networkstress.sh

Signed-off-by Petr Vorel <[email protected]>
---
 testscripts/network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
testscripts/network.sh +1 -1
index 6b81823f9..2d2c6762c 100755
@@ -94,7 +94,7 @@ if [ ${VERBOSE} = "yes" ]; then
 	echo " - ${LHOST_IFACES} local interface (MAC address: ${LHOST_HWADDRS})"
 	echo " - ${RHOST_IFACES} remote interface (MAC address: ${RHOST_HWADDRS})"
 
-	cat $TMPDIR/network_stress.tests
+	cat $CMDFILE
 	${LTPROOT}/ver_linux
 	echo ""
 	echo ${LTPROOT}/bin/ltp-pan -e -l /tmp/netpan.log -S -a ltpnet -n ltpnet -f $CMDFILE
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 2/2 network: cleanup duplicity + other minor cleanup

Signed-off-by Petr Vorel <[email protected]>
---
 testscripts/network.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)
testscripts/network.sh +14 -11
index 2d2c6762c..0736bf1e3 100755
@@ -11,7 +11,7 @@ fi
 export TMPDIR=/tmp/netpan-$$
 mkdir -p $TMPDIR
 CMDFILE=${TMPDIR}/network.tests
-VERBOSE="no"
+VERBOSE=
 
 export PATH="${PATH}:${LTPROOT}/testcases/bin"
 

@@ -89,20 +89,23 @@ done
 
 cd $TMPDIR
 
-if [ ${VERBOSE} = "yes" ]; then
-	echo "Network parameters:"
-	echo " - ${LHOST_IFACES} local interface (MAC address: ${LHOST_HWADDRS})"
-	echo " - ${RHOST_IFACES} remote interface (MAC address: ${RHOST_HWADDRS})"
+COMMAND="$LTPROOT/bin/ltp-pan -e -l /tmp/netpan.log -S -a ltpnet -n ltpnet -f $CMDFILE"
+if [ "$VERBOSE" = "yes" ]; then
+cat << EOF
+Network parameters:
+ - ${LHOST_IFACES} local interface (MAC address: ${LHOST_HWADDRS})
+ - ${RHOST_IFACES} remote interface (MAC address: ${RHOST_HWADDRS})
 
-	cat $CMDFILE
-	${LTPROOT}/ver_linux
-	echo ""
-	echo ${LTPROOT}/bin/ltp-pan -e -l /tmp/netpan.log -S -a ltpnet -n ltpnet -f $CMDFILE
+`cat $CMDFILE`
+`${LTPROOT}/ver_linux`
+
+$COMMAND
+EOF
 fi
 
-${LTPROOT}/bin/ltp-pan -e -l /tmp/netpan.log -S -a ltpnet -n ltpnet -f $CMDFILE
+$COMMAND
 
-if [ $? -eq "0" ]; then
+if [ $? -eq 0 ]; then
 	echo ltp-pan reported PASS
 else
 	echo ltp-pan reported FAIL
Signature · 1 line
2.11.0