Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1492: Don't alter `LD_LIBRARY_PATH`, `PKG_CONFIG_PATH` and `C_INCLUDE_PATH` in tests

9072e10d91 Don't alter LD_LIBRARY_PATH, PKG_CONFIG_PATH and C_INCLUDE_PATH in tests (Kristaps Kaupe)

Pull request description:

  Fixes #1430.

  Problem was that, with altered `LD_LIBRARY_PATH`, for system wide installed `bitcoind`, `libsecp256k1.so.0` from jmvenv was loaded, not the one from `/usr/lib64`.

  <del>I assume changes for `C_INCLUDE_PATH` may be needed to build miniircd, but don't see why `LD_LIBRARY_PATH` should be changed at all.</del>

Top commit has no ACKs.

Tree-SHA512: f31d4c5e0c4bbdb41d83a8ed79a86794e6985f0e92a538485e28ee828dc16e9b1cd46884ed7f37c8453a526489ac82ad146ad72d398e208d19ca59f4e2165285
master
Kristaps Kaupe 3 years ago
parent
commit
b184527d5d
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 3
      test/run_tests.sh

3
test/run_tests.sh

@ -172,9 +172,6 @@ run_jm_tests ()
fi fi
jm_requirements="requirements/testing.txt" jm_requirements="requirements/testing.txt"
jm_source="${VIRTUAL_ENV}/.." jm_source="${VIRTUAL_ENV}/.."
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${VIRTUAL_ENV}/lib/pkgconfig"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${VIRTUAL_ENV}/lib"
export C_INCLUDE_PATH="${C_INCLUDE_PATH}:${VIRTUAL_ENV}/include"
pushd "${jm_source}" || return 1 pushd "${jm_source}" || return 1
if [ ! -f 'miniircd.tar.gz' ] || ! sha256_verify 'ce3a4ddc777343645ccd06ca36233b5777e218ee89d887ef529ece86a917fc33' 'miniircd.tar.gz'; then if [ ! -f 'miniircd.tar.gz' ] || ! sha256_verify 'ce3a4ddc777343645ccd06ca36233b5777e218ee89d887ef529ece86a917fc33' 'miniircd.tar.gz'; then

Loading…
Cancel
Save