Fix install_all issue and failing test cases that fail after NRD becomes part of NFD.
Change-Id: Ic254244be99e289f43af86ecf6c82aad8460c538
Refs: #1641
diff --git a/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh b/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh
index c9e7710..96bbd76 100755
--- a/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh
+++ b/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh
@@ -24,7 +24,10 @@
}
# start nfd on host A
-sudo nfd > logs/nfd.log 2>&1 &
+sudo nfd &> logs/nfd.log &
+sleep 2
+nrd &> logs/nrd.log &
+sleep 2
# start nfd and ndn-traffic-server on host D
echo "starting nfd and ndn-traffic-server on host D..."
@@ -32,6 +35,8 @@
ssh $CTRL_D "mkdir -p $workdir/logs;\
sudo nfd &> $workdir/logs/nfd.log &\
sleep 3;\
+ nrd &> $workdir/logs/nrd.log &\
+ sleep 3;\
ndn-traffic-server $workdir/NDNTrafficServer.conf > $workdir/logs/server.log 2>&1 &"
sleep 5
@@ -54,8 +59,8 @@
echo "stopping nfd on host A..."
sudo killall nfd
-# stop ndn-traffic-server and nfd on hostB
-echo "stopping ndn-traffic-server and nfd on host B..."
+# stop ndn-traffic-server and nfd on hostD
+echo "stopping ndn-traffic-server and nfd on host D..."
clean_up
# examine client log