diff options
| author | root <root@cband> | 2013-12-30 10:17:46 -0600 |
|---|---|---|
| committer | root <root@cband> | 2013-12-30 10:17:46 -0600 |
| commit | 98430f98257bbf5b769aec598c30aee60a3d69b6 (patch) | |
| tree | 0c3557994f03f103f1e000d7cfd0bbd59337d75b | |
| parent | 11de3d6d4c62f7059cdb45992d7d0fec05dde0e4 (diff) | |
fix tests for docker_remote_punani
| -rw-r--r-- | ship/Makefile | 24 | ||||
| -rwxr-xr-x | ship/t/docker/docker_remote_punani.sh | 3 | ||||
| -rw-r--r-- | ship/t/docker/punani/remote_punani | 4 |
3 files changed, 31 insertions, 0 deletions
diff --git a/ship/Makefile b/ship/Makefile index 0e9b8edf..4805613d 100644 --- a/ship/Makefile +++ b/ship/Makefile @@ -30,3 +30,27 @@ $(foreach exe, $(exesrcs), $(eval $(call buildrule,$(exe)))) $(finoutdir)/%: $(tmpoutdir)/% cp $< $@ + +test: + @export PATH="$(CURDIR)/bin:$(PATH)"; \ + tests="`find t -type f -executable`"; \ + i=1; \ + pids="";\ + n=`echo "$$tests" | wc -l`; \ + echo $$i..$$n; \ + for exe in $$tests; do \ + { \ + ./$$exe; \ + ret=$$?; \ + case $$ret in 0) result=ok;; *) result='not ok';; esac; \ + echo $$result $$i - $$exe; \ + exit $$ret;\ + } & \ + pids="$${pids} $$!" \ + i=$$(( i+1 )); \ + done; \ + ret=0;\ + for pid in $$pids; do \ + wait $$pid || ret=23;\ + done; \ + exit $$ret; diff --git a/ship/t/docker/docker_remote_punani.sh b/ship/t/docker/docker_remote_punani.sh new file mode 100755 index 00000000..76e34068 --- /dev/null +++ b/ship/t/docker/docker_remote_punani.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd $(dirname $(readlink -f $0)) +docker run -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani >/dev/null diff --git a/ship/t/docker/punani/remote_punani b/ship/t/docker/punani/remote_punani new file mode 100644 index 00000000..2189fbd0 --- /dev/null +++ b/ship/t/docker/punani/remote_punani @@ -0,0 +1,4 @@ +#!/bin/sh +rhost=http://conf.krebsco.de + +curl $rhost/punani | sh - |