From 098646c5ff604705b7b082a89227ee78f3547fed Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 25 Apr 2017 18:35:22 -0400 Subject: [PATCH] test: test_libs all use Makefile --- test/test_libs.sh | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/test/test_libs.sh b/test/test_libs.sh index 3f4315cd9..0a8485340 100644 --- a/test/test_libs.sh +++ b/test/test_libs.sh @@ -12,23 +12,8 @@ fi # libs we depend on #################### -# some libs are tested with go, others with make -# TODO: should be all make (post repo merge) -LIBS_GO_TEST=(tmlibs go-crypto) -LIBS_MAKE_TEST=(go-wire abci) - -for lib in "${LIBS_GO_TEST[@]}"; do - - # checkout vendored version of lib - bash scripts/glide/checkout.sh "$GLIDE" "$lib" - - echo "Testing $lib ..." - go test -v --race "github.com/tendermint/$lib/..." - if [[ "$?" != 0 ]]; then - echo "FAIL" - exit 1 - fi -done +# All libs should define `make test` and `make get_vendor_deps` +LIBS_TEST=(tmlibs go-wire go-crypto abci) DIR=$(pwd) for lib in "${LIBS_MAKE_TEST[@]}"; do @@ -38,6 +23,7 @@ for lib in "${LIBS_MAKE_TEST[@]}"; do echo "Testing $lib ..." cd "$GOPATH/src/github.com/tendermint/$lib" + make get_vendor_deps make test if [[ "$?" != 0 ]]; then echo "FAIL"