diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2023-11-14 14:45:44 +0100 |
|---|---|---|
| committer | Milan Broz <gmazyland@gmail.com> | 2023-11-15 19:22:27 +0000 |
| commit | 9ca46971f2f85005d5c8e7d11493a4ad46221f7d (patch) | |
| tree | 8a94c463d6bac6a5e2666089d72fd03ba983c3d1 | |
| parent | 7aeb1c3aeaeca548d4a6b84f50382c75424db3e1 (diff) | |
| download | cryptsetup-9ca46971f2f85005d5c8e7d11493a4ad46221f7d.tar.gz | |
Fix systemd-test-plugin initialization.
check for .git subdirectory to decide if systemd
repository needs to be cloned.
| -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 4c64464f..c972f8b9 100755 --- a/tests/systemd-test-plugin +++ b/tests/systemd-test-plugin @@ -85,7 +85,7 @@ CRYPTENROLL_LD_PRELOAD="" SYSTEMD_CRYPTENROLL=$SYSTEMD_PATH/build/systemd-cryptenroll mkdir -p $SYSTEMD_PATH - [ -e $SYSTEMD_PATH ] || git clone --depth=1 https://github.com/systemd/systemd.git $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." ninja -C build/ systemd-cryptenroll libcryptsetup-token-systemd-tpm2.so || skip "Failed to build systemd." @@ -123,7 +123,7 @@ CRYPTENROLL_LD_PRELOAD="" SYSTEMD_CRYPTENROLL=$SYSTEMD_PATH/build/systemd-cryptenroll mkdir -p $SYSTEMD_PATH - [ -e $SYSTEMD_PATH ] || git clone --depth=1 https://github.com/systemd/systemd.git $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." ninja -C build/ systemd-cryptenroll libcryptsetup-token-systemd-tpm2.so || skip "Failed to build systemd." |