diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 06:42:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 06:42:22 +0800 |
| commit | 6b5f25802e73056702b743e0cab284cef49381ad (patch) | |
| tree | f7d67ff79ab2541c101b067c5eba9d6515ef510a | |
| parent | f8c1eb157d6025c16c808fad01d5b32dccd8e2f1 (diff) | |
| parent | 59665ade857cd98a80b7d7ce9b4eee0ee452ebf9 (diff) | |
| download | dexon-6b5f25802e73056702b743e0cab284cef49381ad.tar.gz dexon-6b5f25802e73056702b743e0cab284cef49381ad.tar.zst dexon-6b5f25802e73056702b743e0cab284cef49381ad.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | gocoverage.sh | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index d3ee1e8af..4659503e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go go: - - tip + - 1.4.1 before_install: - sudo add-apt-repository ppa:beineri/opt-qt54 -y - sudo apt-get update -qq @@ -12,7 +12,7 @@ install: - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - go get github.com/mattn/goveralls - go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR - - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi + - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get -d $ETH_DEPS; fi before_script: - gofmt -l -w . - goimports -l -w . @@ -20,8 +20,7 @@ before_script: # - go vet ./... # - go test -race ./... script: - - ./gocoverage.sh - - if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi + - ./gocoverage.sh && if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi env: global: - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig diff --git a/gocoverage.sh b/gocoverage.sh index 5cb2fdf08..4245e3901 100755 --- a/gocoverage.sh +++ b/gocoverage.sh @@ -15,7 +15,7 @@ if ls $dir/*.go &> /dev/null; then # echo $dir if [[ $dir != "./tests/vm" ]] then - $GOROOT/bin/go test -covermode=count -coverprofile=$dir/profile.tmp $dir + go test -covermode=count -coverprofile=$dir/profile.tmp $dir fi if [ -f $dir/profile.tmp ] then @@ -25,5 +25,5 @@ if ls $dir/*.go &> /dev/null; then fi done -$GOROOT/bin/go tool cover -func profile.cov +go tool cover -func profile.cov |