Skip to content

Commit

Permalink
Simplify communicating crypto backend to the test-suite
Browse files Browse the repository at this point in the history
It's fairly amusing how various aspects of integrating autotest seems
easier with cmake than autoconf/automake.
  • Loading branch information
pmatilai committed Sep 28, 2023
1 parent 5802192 commit ea6dab8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 23 deletions.
10 changes: 3 additions & 7 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,10 @@ os_release(OS_NAME ID)
os_release(OS_VERSION VERSION_ID)

set(PYTHON ${Python3_EXECUTABLE})
if (${WITH_INTERNAL_OPENPGP})
if (${WITH_OPENSSL})
set(CRYPTO openssl)
else()
set(CRYPTO libgcrypt)
endif()
if (WITH_INTERNAL_OPENPGP)
set(PGP internal)
else()
set(CRYPTO sequoia)
set(PGP sequoia)
endif()

set(TESTSUITE_AT
Expand Down
17 changes: 1 addition & 16 deletions tests/atlocal.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,7 @@ RPMLIBDIR="@CMAKE_INSTALL_FULL_LIBDIR@"
export RPMLIBDIR

PYTHON=@PYTHON@

CRYPTO=@CRYPTO@
export CRYPTO
if test x$CRYPTO = xlibgcrypt
then
PGP=internal
elif test x$CRYPTO = xopenssl
then
PGP=internal
elif test x$CRYPTO = xsequoia
then
PGP=sequoia
else
echo "Unhandled crypto backend: $CRYPTO"
exit
fi
PGP=@PGP@

RPMTEST="$RPMTREE"
RPMDATA="/data/"
Expand Down

0 comments on commit ea6dab8

Please sign in to comment.