diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2023-11-15 13:32:04 +0100 |
|---|---|---|
| committer | Ondrej Kozina <okozina@redhat.com> | 2023-11-17 10:42:23 +0100 |
| commit | 8c0a943e5cd092c4910846605abb632342824597 (patch) | |
| tree | 70dc5435bbd3525206abc2790928b9835918027c | |
| parent | 5ef1878b34224ad02909493d69cec4d819a47401 (diff) | |
| download | cryptsetup-8c0a943e5cd092c4910846605abb632342824597.tar.gz | |
Drop fake_token_path symbol from tests.
It's no longer used.
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/fake_token_path.c | 6 | ||||
| -rw-r--r-- | tests/meson.build | 14 |
3 files changed, 2 insertions, 30 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c74c8f26..69c3e505 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,13 +47,6 @@ endif systemd-test-plugin: fake_systemd_tpm_path.so -# Do not use global CFLAGS here as the *.so link does not support sanitizers -fake_token_path.so: fake_token_path.c - $(CC) $(LDFLAGS) -I $(top_srcdir)/lib -fPIC -shared -D_GNU_SOURCE \ - -Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \ - -o fake_token_path.so $(top_srcdir)/tests/fake_token_path.c \ - -DBUILD_DIR=\"$(abs_top_srcdir)/.libs/\" - fake_systemd_tpm_path.so: fake_systemd_tpm_path.c $(CC) $(LDFLAGS) -fPIC -shared -D_GNU_SOURCE -o fake_systemd_tpm_path.so \ $(top_srcdir)/tests/fake_systemd_tpm_path.c @@ -105,12 +98,11 @@ EXTRA_DIST = compatimage.img.xz compatv10image.img.xz \ ssh-test-plugin \ generate-symbols-list \ run-all-symbols \ - fake_token_path.c \ fake_systemd_tpm_path.c \ unit-wipe-test \ systemd-test-plugin -CLEANFILES = cryptsetup-tst* valglog* *-fail-*.log test-symbols-list.h fake_token_path.so fake_systemd_tpm_path.so +CLEANFILES = cryptsetup-tst* valglog* *-fail-*.log test-symbols-list.h fake_systemd_tpm_path.so clean-local: -rm -rf tcrypt-images luks1-images luks2-images bitlk-images fvault2-images conversion_imgs \ luks2_valid_hdr.img blkid-luks2-pv-img blkid-luks2-pv-img.bcp external-tokens luks2_invalid_cipher.img @@ -168,7 +160,7 @@ all_symbols_test_CPPFLAGS = $(AM_CPPFLAGS) -D_GNU_SOURCE check_PROGRAMS = api-test api-test-2 differ vectors-test unit-utils-io unit-utils-crypt-test unit-wipe all-symbols-test -check-programs: test-symbols-list.h $(check_PROGRAMS) fake_token_path.so fake_systemd_tpm_path.so +check-programs: test-symbols-list.h $(check_PROGRAMS) fake_systemd_tpm_path.so conversion_imgs: @tar xJf conversion_imgs.tar.xz diff --git a/tests/fake_token_path.c b/tests/fake_token_path.c deleted file mode 100644 index 7b2bad3c..00000000 --- a/tests/fake_token_path.c +++ /dev/null @@ -1,6 +0,0 @@ -#include <libcryptsetup.h> - -const char *crypt_token_external_path(void) -{ - return BUILD_DIR; -} diff --git a/tests/meson.build b/tests/meson.build index 2dd5b0c4..9dac56c8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -132,20 +132,6 @@ all_symbols_test = executable('all-symbols-test', ], include_directories: includes_lib) -fake_token_path = shared_library('fake_token_path', - [ - 'fake_token_path.c', - ], - include_directories: includes_lib, - version: libcryptsetup_version, - link_args: [ - '-Wl,--version-script=' + - libcryptsetup_sym_path, - ], - name_prefix: '', - c_args: ['-DBUILD_DIR="@0@"'.format(tokens_ssh_build_dir)], - build_by_default: not enable_static) - fake_systemd_tpm_path = shared_library('fake_systemd_tpm_path', [ 'fake_systemd_tpm_path.c', |