Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Libssh test fix #412

Merged
merged 2 commits into from
Jul 9, 2024
+3 −3
Merged

Libssh test fix #412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c98db7
tests: Fix title
Jakuje Jul 4, 2024
deb06cf
tests: Build libssh in parallel
Jakuje Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/integration/libssh.sh
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ pkcs11_provider_setup()

libssh_setup()
{
title PRAM "Clone, setup and build libssh"
title PARA "Clone, setup and build libssh"

git clone https://gitlab.com/libssh/libssh-mirror.git \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also fix the link please?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://git.libssh.org/projects/libssh.git/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This git forge is running on some Andreas servers. I do not know how much traffic the cloning from CI is going to generate so I would prefer to keep the gitlab mirror as that is automatically updated every hour or so and is more likely to be present.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, yes, that makes sense, please disregard my comment :). It looks like this mirror is up to date.

"${WORKDIR}"/libssh-mirror
@@ -61,13 +61,13 @@ libssh_setup()
-DWITH_PKCS11_URI=ON \
-DWITH_PKCS11_PROVIDER=ON \
-DPKCS11_PROVIDER="${PKCS11_MODULE}" ..
make
make -j "$(nproc)"
popd
}

libssh_test()
{
title PARAM "Run libssh pkcs11 tests"
title PARA "Run libssh pkcs11 tests"

pushd "${WORKDIR}"/libssh-mirror/build
PKCS11_PROVIDER_DEBUG=file:$PKCS11_DEBUG_FILE ctest \