mirror of
https://github.com/systemd/systemd
synced 2024-09-06 00:41:36 +00:00
test: don't try to find BUILD_DIR when NO_BUILD is set
NO_BUILD=1 indicates that we want to test systemd from the local system and not the one from the local build. Hence there should be no need to call find-build-dir.sh when NO_BUID=1 especially since it's likely that the script will fail to find a local build in this case. This avoids find-build-dir.sh to emit 'Specify build directory with $BUILD_DIR' message when NO_BUILD=1 and no local build can be found. This introduces a behavior change though: systemd from the local system will always be preferred when NO_BUILD=1 even if a local build can be found.
This commit is contained in:
parent
abf062674e
commit
dfd73ccb14
|
@ -83,13 +83,11 @@ TOOLS_DIR="$SOURCE_DIR/tools"
|
|||
export TEST_BASE_DIR TEST_UNITS_DIR SOURCE_DIR TOOLS_DIR
|
||||
|
||||
# note that find-build-dir.sh will return $BUILD_DIR if provided, else it will try to find it
|
||||
if ! BUILD_DIR="$("$TOOLS_DIR"/find-build-dir.sh)"; then
|
||||
if get_bool "${NO_BUILD:=}"; then
|
||||
BUILD_DIR="$SOURCE_DIR"
|
||||
else
|
||||
echo "ERROR: no build found, please set BUILD_DIR or use NO_BUILD" >&2
|
||||
exit 1
|
||||
fi
|
||||
if get_bool "${NO_BUILD:=}"; then
|
||||
BUILD_DIR="$SOURCE_DIR"
|
||||
elif ! BUILD_DIR="$("$TOOLS_DIR"/find-build-dir.sh)"; then
|
||||
echo "ERROR: no build found, please set BUILD_DIR or use NO_BUILD" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
PATH_TO_INIT="$ROOTLIBDIR/systemd"
|
||||
|
|
Loading…
Reference in a new issue