mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
6d5e468db1
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>
21 lines
446 B
Bash
Executable file
21 lines
446 B
Bash
Executable file
#!/usr/bin/env bash
|
|
set -e -o pipefail
|
|
|
|
source hack/make/.integration-test-helpers
|
|
|
|
(
|
|
build_test_suite_binaries
|
|
bundle .integration-daemon-start
|
|
bundle .integration-daemon-setup
|
|
|
|
local testexit=0
|
|
( repeat run_test_integration ) || testexit=$?
|
|
|
|
# Always run cleanup, even if the subshell fails
|
|
bundle .integration-daemon-stop
|
|
cleanup_test_suite_binaries
|
|
error_on_leaked_containerd_shims
|
|
|
|
exit $testexit
|
|
|
|
) 2>&1 | tee -a "$DEST/test.log"
|