diff --git a/tools/run_pr_builder.sh b/tools/run_pr_builder.sh index 73fb2ba6de..1ce6ea8cb2 100755 --- a/tools/run_pr_builder.sh +++ b/tools/run_pr_builder.sh @@ -14,38 +14,32 @@ NOMS_DIR=${WORKSPACE}/src/github.com/attic-labs/noms go version node --version -# # go list is expensive, only do it once. -# GO_LIST="$(go list ./... | grep -v /vendor/ | grep -v /samples/js/)" -# go build ${GO_LIST} +# go list is expensive, only do it once. +GO_LIST="$(go list ./... | grep -v /vendor/ | grep -v /samples/js/)" +go build ${GO_LIST} -# # go test plus build coverage data for upload codecov.io -# rm -rf coverage.txt -# touch coverage.txt -# for d in ${GO_LIST}; do -# go test -coverprofile=profile.out -covermode=atomic $d -# if [ -f profile.out ]; then -# cat profile.out >> coverage.txt -# rm profile.out -# fi -# done +# go test plus build coverage data for upload codecov.io +rm -rf coverage.txt +touch coverage.txt +for d in ${GO_LIST}; do + go test -coverprofile=profile.out -covermode=atomic $d + if [ -f profile.out ]; then + cat profile.out >> coverage.txt + rm profile.out + fi +done -#pushd ${NOMS_DIR} -#python tools/run-all-js-tests.py -#popd - -pushd ${NOMS_DIR}/js/noms -yarn +pushd ${NOMS_DIR} +python tools/run-all-js-tests.py popd # The integration test only works after the node tests because the node tests sets up samples/js/node_modules -echo "== Integration tests" SAMPLES_JS=github.com/attic-labs/noms/samples/js -go test -v ${SAMPLES_JS}/aggregate -go test -v ${SAMPLES_JS}/counter -ls -al ${NOMS_DIR}/samples/js/fs +go test ${SAMPLES_JS}/aggregate +go test ${SAMPLES_JS}/counter +# This test fails #go test -v ${SAMPLES_JS}/fs -go test -v ${SAMPLES_JS}/url_fetch -echo "== Integration tests done" +go test ${SAMPLES_JS}/url_fetch python -m unittest discover -p "*_test.py" -s $GOPATH/src/github.com/attic-labs/noms/tools