diff options
| author | Dan Streetman <ddstreet@canonical.com> | 2020-11-17 16:02:14 -0500 |
|---|---|---|
| committer | Dan Streetman <ddstreet@canonical.com> | 2021-01-26 16:05:49 -0500 |
| commit | 1918406900c2b687cca867d32441ec98f05b16ea (patch) | |
| tree | b06d4cb06f55271bcd1d1244bca6dfd33533e42d /test | |
| parent | 4326586be28a2a41be2fa1fe8abe4941566a9610 (diff) | |
| download | systemd-1918406900c2b687cca867d32441ec98f05b16ea.tar.gz | |
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.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test-functions b/test/test-functions index 837082890a..f6a824ae69 100644 --- a/test/test-functions +++ b/test/test-functions @@ -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." |