From 81775bc03d59458cfcb7fd4835fd99fd68a6cb36 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Thu, 3 Sep 2015 12:03:53 -0500 Subject: [PATCH] Add library paths for tests. Richard Sahw, KF5OIM, reported a failure in the C++ test when attempting to build an RPM package in a clean environment. This patch amends the LD_LIBRARY_PATH in the generated shell scripts in the c++ and tests directories. --- c++/Makefile.am | 2 +- tests/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/c++/Makefile.am b/c++/Makefile.am index c95ae1e06..2f313af1c 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -16,7 +16,7 @@ TESTS = $(check_SCRIPTS) testcpp.sh: - echo 'LD_LIBRARY_PATH=$(top_builddir)/dummy/.libs ./testcpp' > testcpp.sh + echo 'LD_LIBRARY_PATH=$(top_builddir)/c++/.libs:$(top_builddir)/dummy/.libs ./testcpp' > testcpp.sh chmod +x ./testcpp.sh CLEANFILES = testcpp.sh diff --git a/tests/Makefile.am b/tests/Makefile.am index 1933772b7..0d2dc2492 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -68,7 +68,7 @@ TESTS = $(check_SCRIPTS) testrig.sh: - echo 'LD_LIBRARY_PATH=$(top_builddir)/dummy/.libs ./testrig 1' > testrig.sh + echo 'LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(top_builddir)/dummy/.libs ./testrig 1' > testrig.sh chmod +x ./testrig.sh testfreq.sh: