diff options
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/runtest.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/runtest.patch | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch b/meta/recipes-core/libxml/libxml2/runtest.patch index 6e56857caf..cb171d5b36 100644 --- a/meta/recipes-core/libxml/libxml2/runtest.patch +++ b/meta/recipes-core/libxml/libxml2/runtest.patch | |||
@@ -2,47 +2,29 @@ Add 'install-ptest' rule. | |||
2 | Print a standard result line for each test. | 2 | Print a standard result line for each test. |
3 | 3 | ||
4 | Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com> | 4 | Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com> |
5 | Signed-off-by: Andrej Valek <andrej.valek@enea.com> | 5 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
6 | Upstream-Status: Backport | 6 | Upstream-Status: Backport |
7 | 7 | ||
8 | diff -uNr a/Makefile.am b/Makefile.am | 8 | diff -uNr a/Makefile.am b/Makefile.am |
9 | --- a/Makefile.am 2016-05-22 03:49:02.000000000 +0200 | 9 | --- a/Makefile.am 2017-08-28 15:01:14.000000000 +0200 |
10 | +++ b/Makefile.am 2017-06-14 10:38:43.381305385 +0200 | 10 | +++ b/Makefile.am 2017-09-05 08:06:05.752287323 +0200 |
11 | @@ -202,10 +202,24 @@ | 11 | @@ -202,6 +202,15 @@ |
12 | #testOOM_DEPENDENCIES = $(DEPS) | 12 | #testOOM_DEPENDENCIES = $(DEPS) |
13 | #testOOM_LDADD= $(LDADDS) | 13 | #testOOM_LDADD= $(LDADDS) |
14 | 14 | ||
15 | +install-ptest: | 15 | +install-ptest: |
16 | + @(if [ -d .libs ] ; then cd .libs; fi; \ | 16 | + @(if [ -d .libs ] ; then cd .libs; fi; \ |
17 | + install $(noinst_PROGRAMS) $(DESTDIR)) | 17 | + install $(check_PROGRAMS) $(DESTDIR)) |
18 | + cp -r $(srcdir)/test $(DESTDIR) | 18 | + cp -r $(srcdir)/test $(DESTDIR) |
19 | + cp -r $(srcdir)/result $(DESTDIR) | 19 | + cp -r $(srcdir)/result $(DESTDIR) |
20 | + cp -r $(srcdir)/python $(DESTDIR) | 20 | + cp -r $(srcdir)/python $(DESTDIR) |
21 | + cp Makefile $(DESTDIR) | 21 | + cp Makefile $(DESTDIR) |
22 | + sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile | 22 | + sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile |
23 | + | 23 | + |
24 | runtests: | 24 | runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ |
25 | testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) | ||
25 | [ -d test ] || $(LN_S) $(srcdir)/test . | 26 | [ -d test ] || $(LN_S) $(srcdir)/test . |
26 | [ -d result ] || $(LN_S) $(srcdir)/result . | 27 | |
27 | - $(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT) | ||
28 | + $(CHECKER) ./runtest$(EXEEXT) && \ | ||
29 | + $(CHECKER) ./testrecurse$(EXEEXT) && \ | ||
30 | + ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) ./testapi$(EXEEXT) && \ | ||
31 | + $(CHECKER) ./testchar$(EXEEXT) && \ | ||
32 | + $(CHECKER) ./testdict$(EXEEXT) && \ | ||
33 | + $(CHECKER) ./runxmlconf$(EXEEXT) | ||
34 | @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ | ||
35 | $(MAKE) tests ; fi) | ||
36 | |||
37 | @@ -229,7 +243,7 @@ | ||
38 | |||
39 | APItests: testapi$(EXEEXT) | ||
40 | @echo "## Running the API regression tests this may take a little while" | ||
41 | - -@($(CHECKER) $(top_builddir)/testapi -q) | ||
42 | + -@(ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) $(top_builddir)/testapi -q) | ||
43 | |||
44 | HTMLtests : testHTML$(EXEEXT) | ||
45 | @(echo > .memdump) | ||
46 | diff -uNr a/runsuite.c b/runsuite.c | 28 | diff -uNr a/runsuite.c b/runsuite.c |
47 | --- a/runsuite.c 2013-04-12 16:17:11.462823238 +0200 | 29 | --- a/runsuite.c 2013-04-12 16:17:11.462823238 +0200 |
48 | +++ b/runsuite.c 2013-04-17 14:07:24.352693211 +0200 | 30 | +++ b/runsuite.c 2013-04-17 14:07:24.352693211 +0200 |