mirror of
https://github.com/systemd/systemd
synced 2024-07-20 17:56:25 +00:00
test/test-functions: move var assignment
This makes no code change, only moves a small block of vars higher in the file. This makes the next commit a bit easier to read.
This commit is contained in:
parent
4326586be2
commit
1918406900
|
@ -50,6 +50,11 @@ PATH_TO_INIT=$ROOTLIBDIR/systemd
|
|||
[ "$SYSTEMD_NSPAWN" ] || SYSTEMD_NSPAWN=$(which -a $BUILD_DIR/systemd-nspawn systemd-nspawn 2>/dev/null | grep '^/' -m1)
|
||||
[ "$JOURNALCTL" ] || JOURNALCTL=$(which -a $BUILD_DIR/journalctl journalctl 2>/dev/null | grep '^/' -m1)
|
||||
|
||||
STATEDIR="${BUILD_DIR:-.}/test/$(basename $(dirname $(realpath $0)))"
|
||||
STATEFILE="$STATEDIR/.testdir"
|
||||
IMAGESTATEDIR="$STATEDIR/.."
|
||||
TESTLOG="$STATEDIR/test.log"
|
||||
|
||||
BASICTOOLS=(
|
||||
awk
|
||||
basename
|
||||
|
@ -148,11 +153,6 @@ DEBUGTOOLS=(
|
|||
vi
|
||||
)
|
||||
|
||||
STATEDIR="${BUILD_DIR:-.}/test/$(basename $(dirname $(realpath $0)))"
|
||||
STATEFILE="$STATEDIR/.testdir"
|
||||
IMAGESTATEDIR="$STATEDIR/.."
|
||||
TESTLOG="$STATEDIR/test.log"
|
||||
|
||||
is_built_with_asan() {
|
||||
if ! type -P objdump >/dev/null; then
|
||||
ddebug "Failed to find objdump. Assuming systemd hasn't been built with ASAN."
|
||||
|
|
Loading…
Reference in a new issue