From 82b6828f434904428225b90e9ff404bb133361e4 Mon Sep 17 00:00:00 2001 From: Ken Hibino Date: Sun, 13 Sep 2020 06:03:11 -0700 Subject: [PATCH] Replace benchcmp with benchstat --- .travis.yml | 4 ++-- .travis/{benchcmp.sh => benchstat.sh} | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) rename .travis/{benchcmp.sh => benchstat.sh} (54%) diff --git a/.travis.yml b/.travis.yml index 9534a55..67b5c55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ git: go: [1.13.x, 1.14.x, 1.15.x] script: - go test -race -v -coverprofile=coverage.txt -covermode=atomic ./... - - go test -run=XXX -bench=. -loglevel=debug ./... + - go test -run=^$ -bench=. -loglevel=debug ./... services: - redis-server after_success: - - bash ./.travis/benchcmp.sh + - travis_wait 60 bash ./.travis/benchstat.sh - bash <(curl -s https://codecov.io/bash) diff --git a/.travis/benchcmp.sh b/.travis/benchstat.sh similarity index 54% rename from .travis/benchcmp.sh rename to .travis/benchstat.sh index 374efb4..48f5610 100755 --- a/.travis/benchcmp.sh +++ b/.travis/benchstat.sh @@ -2,17 +2,19 @@ if [ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" != "master" ]; then REMOTE_URL="$(git config --get remote.origin.url)"; cd ${TRAVIS_BUILD_DIR}/.. && \ git clone ${REMOTE_URL} "${TRAVIS_REPO_SLUG}-bench" && \ + # turn the detached message off + git config --global advice.detachedHead false && \ cd "${TRAVIS_REPO_SLUG}-bench" && \ # Benchmark master git checkout master && \ - go test -run=XXX -bench=. ./... > master.txt && \ + go test -run=^$ -bench=. -count=5 -timeout=60m -benchmem ./... > master.txt && \ # Benchmark feature branch git checkout ${TRAVIS_COMMIT} && \ - go test -run=XXX -bench=. ./... > feature.txt && \ + go test -run=^$ -bench=. -count=5 -timeout=60m -benchmem ./... > feature.txt && \ # compare two benchmarks - go get -u golang.org/x/tools/cmd/benchcmp && \ - benchcmp master.txt feature.txt; + go get -u golang.org/x/perf/cmd/benchstat && \ + benchstat master.txt feature.txt; fi