test: convert test/ to use meson install

Automatic rebuilding is removed: it doesn't play well with ninja, because
ninja always writes logs, and even if nothing needs to be built, it will
make the log file owned by root. So let's just remove this, and say that
the user must always do the build first.

I'm also keeping make for the tests, because ninja doesn't play well with
sudo.

Since the build directory is arbitrary, it needs to be specified, e.g.
  sudo make BUILD_DIR=/home/zbyszek/src/systemd/build1 -C test/TEST-01-BASIC/

diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile
index 5e89a29effecd19dd50b1f65fdbe19a1d081761d..c29fd0676391f0e6ba0e4ec37ab5c4fb34dfaaeb 100644 (file)
--- a/test/TEST-01-BASIC/Makefile
+++ b/test/TEST-01-BASIC/Makefile
@@ -1,10 +1,2 @@
-all:
-       @make -s --no-print-directory -C ../.. all
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --all
-setup:
-       @make --no-print-directory -C ../.. all
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --setup
-clean:
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean
-run:
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --run
+all setup clean run:
+       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --$@

diff --git a/test/TEST-13-NSPAWN-SMOKE/Makefile b/test/TEST-13-NSPAWN-SMOKE/Makefile
index ff1470f8527c6a7f4b5bd490bca0d50376448646..e58c0d909b070d455c9d012ec2efc4ed9f41d20d 100644 (file)
--- a/test/TEST-13-NSPAWN-SMOKE/Makefile
+++ b/test/TEST-13-NSPAWN-SMOKE/Makefile
@@ -1,11 +1,5 @@
-all:
-       @make -s --no-print-directory -C ../.. all
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --all
-setup:
-       @make --no-print-directory -C ../.. all
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --setup
+all setup run:
+       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --$@
 clean:
        @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean
        @rm -f has-overflow
-run:
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --run

diff --git a/test/TEST-14-MACHINE-ID/Makefile b/test/TEST-14-MACHINE-ID/Makefile
deleted file mode 100644 (file)
index 5e89a29effecd19dd50b1f65fdbe19a1d081761d..0000000000000000000000000000000000000000
--- a/test/TEST-14-MACHINE-ID/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-all:
-       @make -s --no-print-directory -C ../.. all
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --all
-setup:
-       @make --no-print-directory -C ../.. all
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --setup
-clean:
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean
-run:
-       @basedir=../.. TEST_BASE_DIR=../ ./test.sh --run

diff --git a/test/TEST-14-MACHINE-ID/Makefile b/test/TEST-14-MACHINE-ID/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..e9f93b1104cd21161bfe11fb1b3b534ce2ae82b5
--- /dev/null
+++ b/test/TEST-14-MACHINE-ID/Makefile
@@ -0,0 +1 @@
+../TEST-01-BASIC/Makefile
\ No newline at end of file

diff --git a/test/test-functions b/test/test-functions
index ea4f700841b57e9f2b88cb5798e93f52b3ebe9d6..64926089d4ce9238d004e9ed69385067d2deb08d 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -155,7 +155,7 @@ $KERNEL_APPEND \
 run_nspawn() {
     [[ -d /run/systemd/system ]] || return 1
 
-    local _nspawn_cmd="../../systemd-nspawn --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND"
+    local _nspawn_cmd="$BUILD_DIR/systemd-nspawn --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND"
     if [[ "$NSPAWN_TIMEOUT" != "infinity" ]]; then
         _nspawn_cmd="timeout --foreground $NSPAWN_TIMEOUT $_nspawn_cmd"
     fi
@@ -317,7 +317,7 @@ install_dmevent() {
 
 install_systemd() {
     # install compiled files
-    (cd $TEST_BASE_DIR/..; set -x; make DESTDIR=$initdir install)
+    (set -x; DESTDIR=$initdir ninja -C $BUILD_DIR install)
     # remove unneeded documentation
     rm -fr $initdir/usr/share/{man,doc}
     # we strip binaries since debug symbols increase binaries size a lot
@@ -396,7 +396,7 @@ EOF
 install_execs() {
     ddebug "install any Execs from the service files"
     (
-    export PKG_CONFIG_PATH=$TEST_BASE_DIR/../src/core/
+    export PKG_CONFIG_PATH=$BUILD_DIR/src/core/
     systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd)
     systemduserunitdir=$(pkg-config --variable=systemduserunitdir systemd)
     egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/{$systemdsystemunitdir,$systemduserunitdir}/*.service \