| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Fri, 19 Feb 2016 22:48:29 +0100 | |
| changeset 5479 | 7146b76b602e |
| parent 4070 | de7938d475ad |
| permissions | -rw-r--r-- |
|
4070
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Internal patch. |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# Make sure libneon's test use the newly built libneon when running |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
# and not the system-installed one. |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
# Not for upstream. |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
--- test/Makefile.in 2010-05-05 01:25:17.000000000 -0700 |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
+++ test/Makefile.in 2015-03-17 20:38:48.694451293 -0700 |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
@@ -6,6 +6,10 @@ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
LDFLAGS = @LDFLAGS@ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
DEFS = @DEFS@ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
|
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
+LIBRUNPATH = $(shell realpath -P $(top_builddir)/src/.libs) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
+TESTRUNPATH = $(shell realpath -P $(top_builddir)/test/.libs) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
+LD_LIBRARY_PATH = $(LIBRUNPATH):$(TESTRUNPATH) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
+ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
top_builddir = .. |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
top_srcdir = @top_srcdir@ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
srcdir = @srcdir@ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
@@ -71,13 +75,16 @@ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
server.cert client.cert *.p12 *.cert sparse.bin |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
|
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
check: $(TESTS) $(HELPERS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
- @SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh $(TESTS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
+ @SRCDIR=$(srcdir) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
+ $(SHELL) $(srcdir)/run.sh $(TESTS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
|
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
grind: $(TESTS) $(HELPERS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
- @SRCDIR=$(srcdir) HARNESS="$(VALGRIND)" $(SHELL) $(srcdir)/run.sh $(TESTS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
+ @SRCDIR=$(srcdir) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
+ HARNESS="$(VALGRIND)" $(SHELL) $(srcdir)/run.sh $(TESTS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
|
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
lfs-check: largefile $(LFS_HELPERS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
- @SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh largefile |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
+ @SRCDIR=$(srcdir) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
34 |
+ $(SHELL) $(srcdir)/run.sh largefile |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
35 |
|
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
install: $(TESTS) $(HELPERS) |
|
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
37 |
@$(INSTALL) -d $(DESTDIR)$(libdir)/neon-tests |