Skip to content

Commit

Permalink
Drop fake_token_path symbol from tests.
Browse files Browse the repository at this point in the history
It's no longer used.
  • Loading branch information
oniko committed Nov 17, 2023
1 parent 5ef1878 commit 8c0a943
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 30 deletions.
12 changes: 2 additions & 10 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions tests/fake_token_path.c

This file was deleted.

14 changes: 0 additions & 14 deletions tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 8c0a943

Please sign in to comment.