diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | util/Makefile | 12 | ||||
| -rwxr-xr-x | util/t/stt/stt-works-with-espeak | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 1218d9d9..b8e040ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ notifications: on_failure: always template: - "painload/%{branch} %{commit} %{author}: %{message} %{build_url}" -script: "! ( make -C util test | grep '^not ok' )" +script: " make -C util test" before_install: - sudo apt-get install bc -qq - sudo apt-get install w3m -qq diff --git a/util/Makefile b/util/Makefile index d70ca057..3c20f550 100644 --- a/util/Makefile +++ b/util/Makefile @@ -4,14 +4,22 @@ 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; \ - case $$? in 0) result=ok;; *) result='not ok';; esac; \ + ret=$$?; \ + case $$ret in 0) result=ok;; *) result='not ok';; esac; \ echo $$result $$i - $$exe; \ + exit $$ret;\ } & \ + pids="$${pids} $$!" \ i=$$(( i+1 )); \ done; \ - wait + ret=0;\ + for pid in $$pids; do \ + wait $$pid || ret=23;\ + done; \ + exit $$ret; diff --git a/util/t/stt/stt-works-with-espeak b/util/t/stt/stt-works-with-espeak index ff39f567..31710974 100755 --- a/util/t/stt/stt-works-with-espeak +++ b/util/t/stt/stt-works-with-espeak @@ -7,10 +7,4 @@ test_str="hello" trap "rm $tmp" TERM INT EXIT HUP espeak --stdout "$test_str" | flac --totally-silent -f -o "$tmp" - -if stt "$tmp" | egrep "^$test_str\$" >/dev/null ;then - echo "ok" - exit 0 -else - echo "not ok" - exit 1 -fi +stt "$tmp" | egrep "^$test_str\$" >/dev/null |