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_localhost_scope/in-master.sh b/test_localhost_scope/in-master.sh
index faca555..4ddd489 100755
--- a/test_localhost_scope/in-master.sh
+++ b/test_localhost_scope/in-master.sh
@@ -4,7 +4,7 @@
workdir=$(pwd)
clean_up() {
- r=$(mv $HOME/.ndn/client.conf.bk $HOME/.ndn/client.conf 2>&1)
+ r=$(rm $HOME/.ndn/client.conf 2>&1)
r=$(killall socat 2>&1)
r=$(ssh $CTRL_B "killall ndn-traffic-server;\
sudo killall nfd" 2>&1)
@@ -14,13 +14,14 @@
ssh $CTRL_B "mkdir -p $workdir/logs;\
sudo nfd &> $workdir/logs/nfd.log &\
sleep 2;\
+ nrd &> $workdir/logs/nrd.log &\
+ sleep 2;\
ndn-traffic-server $workdir/NDNTrafficServer.conf &> $workdir/logs/server.log &"
sleep 2
# set up socat on A
-cp $HOME/.ndn/client.conf $HOME/.ndn/client.conf.bk
socat -v UNIX-LISTEN:/tmp/localhost-test-B.sock,fork TCP:$IP4_B1:6363 &> logs/socat.log &
-sed -i 's/^unix_socket=.*$/unix_socket=\/tmp\/localhost-test-B.sock/g' $HOME/.ndn/client.conf
+echo "unix_socket=/tmp/localhost-test-B.sock" > $HOME/.ndn/client.conf
sleep 1
# send interest