diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2023-11-15 15:04:30 +0100 |
|---|---|---|
| committer | Milan Broz <gmazyland@gmail.com> | 2023-11-15 19:22:27 +0000 |
| commit | 31f82fd37c15234990a5549d1948170d37e8136d (patch) | |
| tree | 4b76ba97ff97a2b614751e57e80bd76e124b126e | |
| parent | 9ca46971f2f85005d5c8e7d11493a4ad46221f7d (diff) | |
| download | cryptsetup-31f82fd37c15234990a5549d1948170d37e8136d.tar.gz | |
Drop deprecated use of implicit meson setup command.
| -rwxr-xr-x | tests/systemd-test-plugin | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/systemd-test-plugin b/tests/systemd-test-plugin index c972f8b9..8698138e 100755 --- a/tests/systemd-test-plugin +++ b/tests/systemd-test-plugin @@ -87,7 +87,7 @@ CRYPTENROLL_LD_PRELOAD="" mkdir -p $SYSTEMD_PATH [ -d $SYSTEMD_PATH/.git ] || git clone --depth=1 https://github.com/systemd/systemd.git $SYSTEMD_PATH cd $SYSTEMD_PATH - meson -D tpm2=true -D libcryptsetup=true -D libcryptsetup-plugins=true build/ || skip "Failed to configure systemd via meson, some dependencies are probably missing." + meson setup build/ -D tpm2=true -D libcryptsetup=true -D libcryptsetup-plugins=true || skip "Failed to configure systemd via meson, some dependencies are probably missing." ninja -C build/ systemd-cryptenroll libcryptsetup-token-systemd-tpm2.so || skip "Failed to build systemd." cd $CRYPTSETUP_PATH/../tests @@ -125,7 +125,7 @@ CRYPTENROLL_LD_PRELOAD="" mkdir -p $SYSTEMD_PATH [ -d $SYSTEMD_PATH/.git ] || git clone --depth=1 https://github.com/systemd/systemd.git $SYSTEMD_PATH cd $SYSTEMD_PATH - meson -D tpm2=true -D libcryptsetup=true -D libcryptsetup-plugins=true build/ || skip "Failed to configure systemd via meson, some dependencies are probably missing." + meson setup build/ -D tpm2=true -D libcryptsetup=true -D libcryptsetup-plugins=true || skip "Failed to configure systemd via meson, some dependencies are probably missing." ninja -C build/ systemd-cryptenroll libcryptsetup-token-systemd-tpm2.so || skip "Failed to build systemd." cd $CRYPTSETUP_PATH/tests |