Skip to content

Commit

Permalink
Drop deprecated use of implicit meson setup command.
Browse files Browse the repository at this point in the history
  • Loading branch information
oniko authored and mbroz committed Nov 15, 2023
1 parent 9ca4697 commit 31f82fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/systemd-test-plugin
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 31f82fd

Please sign in to comment.