1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #35360 from thaJeztah/fix-autogen-warning

Fix .go-autogen warnings
This commit is contained in:
Daniel Nephin 2017-11-01 15:12:09 -04:00 committed by GitHub
commit a17bfb78e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View file

@ -5,8 +5,10 @@
# #
# TESTFLAGS='-check.f DockerSuite.TestBuild*' ./hack/make.sh binary test-integration # TESTFLAGS='-check.f DockerSuite.TestBuild*' ./hack/make.sh binary test-integration
# #
if [ -z $MAKEDIR ]; then
source "$SCRIPTDIR/make/.go-autogen" export MAKEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
fi
source "$MAKEDIR/.go-autogen"
# Set defaults # Set defaults
: ${TEST_REPEAT:=1} : ${TEST_REPEAT:=1}

View file

@ -2,7 +2,6 @@
# required by `make build-integration-cli-on-swarm` # required by `make build-integration-cli-on-swarm`
set -e set -e
source "${MAKEDIR}/.go-autogen"
source hack/make/.integration-test-helpers source hack/make/.integration-test-helpers
build_test_suite_binaries build_test_suite_binaries

View file

@ -1,7 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e -o pipefail set -e -o pipefail
source "${MAKEDIR}/.go-autogen"
source hack/make/.integration-test-helpers source hack/make/.integration-test-helpers
( (