hack/make/test-integration-cli: introduce MAKEDIR variable
- every execution of dirname costs time - less repeating Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk> Upstream-commit: 6533cb973f6bab672018148fd6a67644580cc61f Component: engine
This commit is contained in:
@ -5,7 +5,7 @@ DEST=$1
|
||||
|
||||
# subshell so that we can export PATH without breaking other things
|
||||
(
|
||||
source "$(dirname "$BASH_SOURCE")/.integration-daemon-start"
|
||||
source "${MAKEDIR}/.integration-daemon-start"
|
||||
|
||||
# we need to wrap up everything in between integration-daemon-start and
|
||||
# integration-daemon-stop to make sure we kill the daemon and don't hang,
|
||||
@ -76,7 +76,7 @@ DEST=$1
|
||||
# clean up after ourselves
|
||||
rm -f Dockerfile.build
|
||||
|
||||
source "$(dirname "$BASH_SOURCE")/.integration-daemon-stop"
|
||||
source "${MAKEDIR}/.integration-daemon-stop"
|
||||
|
||||
[ -z "$didFail" ] # "set -e" ftw
|
||||
) 2>&1 | tee -a $DEST/test.log
|
||||
|
||||
Reference in New Issue
Block a user