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

Fix .go-autogen warnings

Browse source 
The `.integration-test-helpers` script was sourced by `/etc/bash/bash.rc`.
However, the `$SCRIPTDIR` environment variable is set through `hack/make.sh`,
so will not be set when calling the `.integration-test-helpers` script directly.

Before this patch;

    make BIND_DIR=. shell
    ...
    bash: /make/.go-autogen: No such file or directory

After this patch, the warning is no longer printed

Also removed sourcing `.go-autogen` from test-integration and build-integration-test-binary,
as they already sourced `.integration-test-helpers` (which sources
`.go-autogen`).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2017-11-01 11:12:27 +01:00
parent ba99c19b59
commit 6d5e468db1
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hack/make/.integration-test-helpers
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}

1
hack/make/build-integration-test-binary
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

1
hack/make/test-integration
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
( (