1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
|
Fix test environment.
--- a/octave/Makefile.am
+++ b/octave/Makefile.am
@@ -5,5 +5,5 @@
lhapdf.oct: wrapoctave.cc
$(MKOCTFILE) -I$(top_srcdir)/include -v -g -o lhapdf.oct wrapoctave.cc -L$(top_builddir)/lib -L$(top_builddir)/lib/.libs -lLHAPDF
-TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets $(OCTAVE)
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets LD_LIBRARY_PATH="$(top_builddir)/lib/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" $(OCTAVE)
TESTS = $(srcdir)/lhapdf-octave-example1.m
--- a/octave/Makefile.in
+++ b/octave/Makefile.in
@@ -196,7 +196,7 @@
top_srcdir = @top_srcdir@
EXTRA_DIST = lhapdf-octave-example1.m wrapoctave.cc
pkgdata_DATA = lhapdf.oct
-TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets $(OCTAVE)
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets LD_LIBRARY_PATH="$(top_builddir)/lib/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" $(OCTAVE)
TESTS = $(srcdir)/lhapdf-octave-example1.m
all: all-am
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -12,7 +12,7 @@
lhapdf_example9_SOURCES = Example9.f
lhapdf_example10_SOURCES = Example10.f
-#TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
TESTS = lhapdf-example1
# lhapdf-example2 lhapdf-example3
|