Browse Source

update tests for makefile

pull/1001/head
Ethan Buchman 7 years ago
parent
commit
1e52751344
2 changed files with 6 additions and 7 deletions
  1. +1
    -1
      test/docker/Dockerfile
  2. +5
    -6
      test/run_test.sh

+ 1
- 1
test/docker/Dockerfile View File

@ -17,7 +17,7 @@ WORKDIR $REPO
ADD glide.yaml glide.yaml ADD glide.yaml glide.yaml
ADD glide.lock glide.lock ADD glide.lock glide.lock
ADD Makefile Makefile ADD Makefile Makefile
RUN make tools
RUN make get_tools
RUN make get_vendor_deps RUN make get_vendor_deps
# Install the apps # Install the apps


+ 5
- 6
test/run_test.sh View File

@ -7,8 +7,7 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "Current branch: $BRANCH" echo "Current branch: $BRANCH"
# run the linter # run the linter
# TODO: drop the `_test` once we're ballin' enough
make metalinter_test
make metalinter
# run the go unit tests with coverage # run the go unit tests with coverage
bash test/test_cover.sh bash test/test_cover.sh
@ -20,8 +19,8 @@ bash test/app/test.sh
bash test/persist/test.sh bash test/persist/test.sh
if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
echo ""
echo "* branch $BRANCH; testing libs"
# checkout every github.com/tendermint dir and run its tests
bash test/test_libs.sh
echo ""
echo "* branch $BRANCH; testing libs"
# checkout every github.com/tendermint dir and run its tests
bash test/test_libs.sh
fi fi

Loading…
Cancel
Save