making test helpers more robust so scope can use them

test/setup.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
 . ./config.sh
 
 (cd ./tls && go get ./... && go run generate_certs.go $HOSTS)
@@ -11,9 +13,8 @@ echo "  prefetch test images"
 for HOST in $HOSTS; do
     docker_on $HOST load -i ../weave.tar
     run_on $HOST mkdir -p bin
-    cat ../bin/docker-ns | run_on $HOST sh -c "cat > $DOCKER_NS"
-    cat ../weave | run_on $HOST sh -c "cat > ./weave"
-    run_on $HOST chmod a+x $DOCKER_NS ./weave
+    upload_executable $HOST ../bin/docker-ns
+    upload_executable $HOST ../weave
     rsync -az -e "$SSH" ./tls/ $HOST:~/tls
     for IMG in $TEST_IMAGES ; do
         docker_on $HOST inspect --format=" " $IMG >/dev/null 2>&1 || docker_on $HOST pull $IMG