Split logs into test cases to prevent overwriting
refs #2907
Change-Id: Ia7ca07fe0d7cd7428dbba5db443e87983aaaca3f
diff --git a/test_localhost_scope/in-master.sh b/test_localhost_scope/in-master.sh
index 7babc24..7149fd6 100755
--- a/test_localhost_scope/in-master.sh
+++ b/test_localhost_scope/in-master.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
source ../multi-host.conf
-mkdir -p logs
+mkdir -p logs/in
workdir=$(pwd)
clean_up() {
@@ -11,14 +11,14 @@
}
# start nfd and ndn-traffic-server on hostB
-ssh $CTRL_B "mkdir -p $workdir/logs;\
- sudo nfd &> $workdir/logs/nfd.log &\
+ssh $CTRL_B "mkdir -p $workdir/logs/in;\
+ sudo nfd &> $workdir/logs/in/nfd.log &\
sleep 2;\
- ndn-traffic-server $workdir/NDNTrafficServer.conf &> $workdir/logs/server.log &"
+ ndn-traffic-server $workdir/NDNTrafficServer.conf &> $workdir/logs/in/server.log &"
sleep 2
# set up socat on A
-socat -v UNIX-LISTEN:/tmp/localhost-test-B.sock,fork TCP:$IP4_B1:6363 &> logs/socat.log &
+socat -v UNIX-LISTEN:/tmp/localhost-test-B.sock,fork TCP:$IP4_B1:6363 &> logs/in/socat.log &
echo "transport=unix:///tmp/localhost-test-B.sock" > $HOME/.ndn/client.conf
sleep 1
@@ -33,14 +33,14 @@
# copy back the server log
ssh $CTRL_B "killall ndn-traffic-server"
-scp $CTRL_B:$workdir/logs/server.log $workdir/logs/
+scp $CTRL_B:$workdir/logs/in/server.log $workdir/logs/in
# analyze server log
-output=$(grep "Total Interests Received" $workdir/logs/server.log | head -1 | cut -d= -f2 | cut -d' ' -f2)
+output=$(grep "Total Interests Received" $workdir/logs/in/server.log | head -1 | cut -d= -f2 | cut -d' ' -f2)
if [[ $output != 0?(.+(0)) ]]
then
echo "Expected no Interests received on host B. Actual: $output"
- echo "For more information, please examine the log at \"$(pwd)/logs\""
+ echo "For more information, please examine the log at \"$(pwd)/logs/in\""
clean_up
exit 3
fi