Merge pull request #20 from cgasparini/makefile

Fix make clean logs

Makefile

@@ -82,7 +82,8 @@ clean:
 	    @echo "# cleaning"
 		@rm -f examples/gobgp_watch_plugin/gobgp_watch_plugin
 		@rm -f docker/gobgp_route_reflector/gobgp-client-in-host/gobgp-client-in-host
-		@rm -f docker/gobgp_route_reflector/gobgp-client-in-host/log
+		@rm -f docker/gobgp_route_reflector/usage_scripts/gobgp-client-in-host/log
+		@rm -f log
 		@echo "# done"
 
 #run all

docker/gobgp_route_reflector/usage_scripts/addPath.sh

@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
 
+PREFIX="101.0.0.0/24"
+NEXTHOP="101.0.10.1"
 ## Advertize path
-docker exec -i gobgp-for-rr bash <<< "gobgp global rib add -a ipv4 101.0.0.0/24 nexthop 101.0.10.1"
+echo "##### prefix "$PREFIX
+echo "##### nexthop "$NEXTHOP
+
+(
+echo "gobgp global rib add -a ipv4 "$PREFIX" nexthop "$NEXTHOP
+) | docker exec -i gobgp-for-rr bash

scripts/run_gobgp_watcher_examples.sh

@@ -33,7 +33,11 @@ echo "#### running go example (gobgp plugin,example plugin)"
 expected=("Agent received path &{65001 101.0.0.0/24 101.0.10.1}
 ")
 
-testOutput ./examples/gobgp_watch_plugin/gobgp_watch_plugin "${expected}"
+./examples/gobgp_watch_plugin/gobgp_watch_plugin &> log &
+sleep 20
+echo "$(less log)"
+echo "#### validating Go example output"
+testOutput "$(less log)" "${expected}"
 echo "done"
 
 echo ""

scripts/testOuput.sh

@@ -23,10 +23,6 @@ IFS="${PREV_IFS}"
 sleep 2
 IFS="
 "
-    echo "Output of $1:"
-    cat ${TMP_FILE}
-    echo ""
-    echo "Checking output of $1"
     rv=0
     # loop through expected lines
     for i in $2