diff --git a/Makefile b/Makefile index 171180e39b..02cd94cc2c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ GOTOOLS = github.com/mitchellh/gox \ github.com/rigelrozanski/shelldown/cmd/shelldown TUTORIALS=$(shell find docs/guide -name "*md" -type f) -EXAMPLES := counter eyes basecoin +EXAMPLES := counter eyes basecoin INSTALL_EXAMPLES := $(addprefix install_,${EXAMPLES}) TEST_EXAMPLES := $(addprefix testex_,${EXAMPLES}) @@ -37,7 +37,6 @@ test_unit: @go test `glide novendor` test_cli: $(TEST_EXAMPLES) - ./tests/cli/init-server.sh # sudo apt-get install jq # wget "https://raw.githubusercontent.com/kward/shunit2/master/source/2.1/src/shunit2" diff --git a/examples/basecoin/Makefile b/examples/basecoin/Makefile index a2557acfe3..78dd637e89 100644 --- a/examples/basecoin/Makefile +++ b/examples/basecoin/Makefile @@ -12,6 +12,7 @@ test_cli: ./tests/cli/keys.sh ./tests/cli/rpc.sh ./tests/cli/init.sh + ./tests/cli/init-server.sh ./tests/cli/basictx.sh ./tests/cli/roles.sh ./tests/cli/restart.sh diff --git a/tests/cli/init-server.sh b/examples/basecoin/tests/cli/init-server.sh similarity index 94% rename from tests/cli/init-server.sh rename to examples/basecoin/tests/cli/init-server.sh index 03404e5c35..dfd503df7d 100755 --- a/tests/cli/init-server.sh +++ b/examples/basecoin/tests/cli/init-server.sh @@ -38,6 +38,8 @@ oneTimeTearDown() { } # load and run these tests with shunit2! +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory CLI_DIR=$GOPATH/src/github.com/cosmos/cosmos-sdk/tests/cli + . $CLI_DIR/common.sh . $CLI_DIR/shunit2