diff options
| author | David Golden <xdg@xdg.me> | 2018-11-30 09:50:32 -0500 |
|---|---|---|
| committer | David Golden <xdg@xdg.me> | 2018-12-07 12:46:44 -0500 |
| commit | 00bf03c454e7796d507ad2e1ee80c5d75e270879 (patch) | |
| tree | f6bf7c57163802cb0eb44c77bc161c2bfe778cf4 /etc/system_perf.yml | |
| parent | 4b967bc68b65afd145b8b0a98c4868fd217bd14e (diff) | |
| download | mongo-00bf03c454e7796d507ad2e1ee80c5d75e270879.tar.gz | |
Import tools: c1d0d6967c84c62b5b578f7b18a82226b5c76526 from branch v3.6
ref: 7e7a3acf2b..c1d0d6967c
for: 3.6.10
TOOLS-1566 Should not include "ssl" tag for Linux 64 build
TOOLS-1709 Set build version and git revision using -ldflags
TOOLS-1742 import cycle between util and testutil
TOOLS-1996 Allow building tools from inside an ordinary GOPATH
TOOLS-2099 Tools jstests failing on replica set shutdown
TOOLS-2149 Configure build outside Evergreen
Diffstat (limited to 'etc/system_perf.yml')
| -rw-r--r-- | etc/system_perf.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/system_perf.yml b/etc/system_perf.yml index a950f9bef92..69a9a40b5ec 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -90,7 +90,7 @@ functions: file: src/compile_expansions.yml - command: shell.exec params: - working_dir: src/src/mongo/gotools + working_dir: src/src/mongo/gotools/src/github.com/mongodb/mongo-tools script: | set -o verbose set -o errexit @@ -98,16 +98,17 @@ functions: if [ "Windows_NT" = "$OS" ]; then set -o igncr fi; - sed -i.bak "s/built-without-version-string/$(git describe)/" common/options/options.go - sed -i.bak "s/built-without-git-spec/$(git rev-parse HEAD)/" common/options/options.go - . ./${set_tools_gopath|set_gopath.sh} + # set_goenv provides set_goenv(), print_ldflags() and print_tags() used below + . ./set_goenv.sh + GOROOT="" set_goenv || exit + go version build_tools="bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop" if [ "${build_mongoreplay}" = "true" ]; then - build_tools="$build_tools mongoreplay" + build_tools="$build_tools mongoreplay" fi for i in $build_tools; do - ${gorootvars} go build ${tooltags|} -o "../../mongo-tools/$i${exe|}" $i/main/$i.go - "../../mongo-tools/$i${exe|}" --version + go build -ldflags "$(print_ldflags)" ${args} -tags "$(print_tags ${tooltags})" -o "../../../../../../mongo-tools/$i${exe|}" $i/main/$i.go + "../../../../../../mongo-tools/$i${exe|}" --version done - command: shell.exec params: @@ -579,7 +580,6 @@ buildvariants: - wtdevelop expansions: compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars - gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH" platform: linux project_dir: &project_dir dsi tooltags: "" |