1 # Internal patch.

     2 # Make sure libneon's test use the newly built libneon when running

     3 # and not the system-installed one.

     4 # Not for upstream.

     5 --- test/Makefile.in	2010-05-05 01:25:17.000000000 -0700

     6 +++ test/Makefile.in	2015-03-17 20:38:48.694451293 -0700

     7 @@ -6,6 +6,10 @@

     8  LDFLAGS = @LDFLAGS@

     9  DEFS = @DEFS@

    10  

    11 +LIBRUNPATH = $(shell realpath -P $(top_builddir)/src/.libs)

    12 +TESTRUNPATH = $(shell realpath -P $(top_builddir)/test/.libs)

    13 +LD_LIBRARY_PATH = $(LIBRUNPATH):$(TESTRUNPATH)

    14 +

    15  top_builddir = ..

    16  top_srcdir = @top_srcdir@

    17  srcdir = @srcdir@

    18 @@ -71,13 +75,16 @@

    19  	   server.cert client.cert *.p12 *.cert sparse.bin

    20  

    21  check: $(TESTS) $(HELPERS)

    22 -	@SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh $(TESTS)

    23 +	@SRCDIR=$(srcdir)  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \

    24 +	  $(SHELL) $(srcdir)/run.sh $(TESTS)

    25  

    26  grind: $(TESTS) $(HELPERS)

    27 -	@SRCDIR=$(srcdir) HARNESS="$(VALGRIND)" $(SHELL) $(srcdir)/run.sh $(TESTS)

    28 +	@SRCDIR=$(srcdir) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \

    29 +	  HARNESS="$(VALGRIND)" $(SHELL) $(srcdir)/run.sh $(TESTS)

    30  

    31  lfs-check: largefile $(LFS_HELPERS)

    32 -	@SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh largefile

    33 +	@SRCDIR=$(srcdir) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \

    34 +	  $(SHELL) $(srcdir)/run.sh largefile

    35  

    36  install: $(TESTS) $(HELPERS)

    37  	@$(INSTALL) -d $(DESTDIR)$(libdir)/neon-tests