[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Bugs when using rsa-sha2 (+patches)


On Thursday, 15 November 2018 11:09:20 CET Tilo Eckert wrote:
> Hi

Hi,

> I had some trouble testing with "-DCLIENT_TESTING=ON". I'm wondering why
> it actually works in the CI builds on Gitlab. All client tests failed
> for me because LD_PRELOAD failed. It attempted to load
> 
> > <libsshdir>/build/tests/libchroot_wrapper.so
> 
> instead of
> 
> > <libsshdir>/build/lib/libchroot_wrapper.so
> 
> where the library is actually located.
> 
> I ended up changing this line in libssh/tests/CMakeLists.txt:
> > set(CHROOT_WRAPPER_LIBRARY
> > ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}chroot_wrapper$
> > {CMAKE_SHARED_LIBRARY_SUFFIX})
> to
> 
> > set(CHROOT_WRAPPER_LIBRARY
> > ${CMAKE_CURRENT_BINARY_DIR}/../lib/${CMAKE_SHARED_LIBRARY_PREFIX}chroot_w
> > rapper${CMAKE_SHARED_LIBRARY_SUFFIX})
> to get client tests to work. Any idea why I had to make that change and
> why Gitlab CI tests work without it?

Oh yes, this changed with: aa899f8ec06e21980403526fdb979071ecd9a65e


The attached patch should correctly deal with it ...


	Andreas

-- 
Andreas Schneider                 asn@xxxxxxxxxxxxxx
GPG-ID:     8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
From aa56b8ca5306825bcba91788e233b71507477b8c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@xxxxxxxxxxxxxx>
Date: Thu, 15 Nov 2018 13:38:02 +0100
Subject: [PATCH] tests: Fix chroot_wrapper location

Signed-off-by: Andreas Schneider <asn@xxxxxxxxxxxxxx>
---
 tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 64d96fc5..855cbaa6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -84,7 +84,7 @@ if (CLIENT_TESTING)
 
     # chroot_wrapper
     add_library(chroot_wrapper SHARED chroot_wrapper.c)
-    set(CHROOT_WRAPPER_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}chroot_wrapper${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(CHROOT_WRAPPER_LIBRARY ${libssh_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}chroot_wrapper${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(TEST_TARGET_LIBRARIES
         ${TEST_TARGET_LIBRARIES}
         chroot_wrapper
-- 
2.19.1


References:
Bugs when using rsa-sha2 (+patches)Tilo Eckert <tilo.eckert@xxxxxxx>
Archive administrator: postmaster@lists.cynapses.org