Merge branch 'feature-makefile' into release-0.8.0

test/tools/end.sh

@@ -5,3 +5,9 @@
 
 echo "------- End -------"
 echo $error " failed " $ok " succeeded"
+
+if [ "$error" -eq 0 ]; then
+  exit 0
+else
+  exit 1
+fi

test/tools/run-container.sh

@@ -2,10 +2,10 @@
 
 echo "docker.io run --name $testContainer $runOptions -d $testImage"
 ID=`docker.io run --name $testContainer $runOptions -d $testImage`
-sleep 7
+sleep 10
 
 echo " --> Obtaining IP"
-IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
+IP=`docker.io inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
 if [ "$IP" = "" ]; then
 	abort "Unable to obtain container IP"
 	exit 1