diff options
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/runtest.patch | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch b/meta/recipes-core/libxml/libxml2/runtest.patch index 397ab20c30..6e56857caf 100644 --- a/meta/recipes-core/libxml/libxml2/runtest.patch +++ b/meta/recipes-core/libxml/libxml2/runtest.patch | |||
| @@ -2,12 +2,13 @@ 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 | Upstream-Status: Pending | 5 | Signed-off-by: Andrej Valek <andrej.valek@enea.com> |
| 6 | Upstream-Status: Backport | ||
| 6 | 7 | ||
| 7 | diff -uNr a/Makefile.am b/Makefile.am | 8 | diff -uNr a/Makefile.am b/Makefile.am |
| 8 | --- a/Makefile.am 2013-04-17 14:51:42.633386477 +0200 | 9 | --- a/Makefile.am 2016-05-22 03:49:02.000000000 +0200 |
| 9 | +++ b/Makefile.am 2013-04-19 14:47:51.544720568 +0200 | 10 | +++ b/Makefile.am 2017-06-14 10:38:43.381305385 +0200 |
| 10 | @@ -202,10 +202,19 @@ | 11 | @@ -202,10 +202,24 @@ |
| 11 | #testOOM_DEPENDENCIES = $(DEPS) | 12 | #testOOM_DEPENDENCIES = $(DEPS) |
| 12 | #testOOM_LDADD= $(LDADDS) | 13 | #testOOM_LDADD= $(LDADDS) |
| 13 | 14 | ||
| @@ -24,10 +25,24 @@ diff -uNr a/Makefile.am b/Makefile.am | |||
| 24 | [ -d test ] || $(LN_S) $(srcdir)/test . | 25 | [ -d test ] || $(LN_S) $(srcdir)/test . |
| 25 | [ -d result ] || $(LN_S) $(srcdir)/result . | 26 | [ -d result ] || $(LN_S) $(srcdir)/result . |
| 26 | - $(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT) | 27 | - $(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT) |
| 27 | + ./runtest$(EXEEXT) ; ./testrecurse$(EXEEXT) ; ./testapi$(EXEEXT) ; ./testchar$(EXEEXT) ; ./testdict$(EXEEXT) ; ./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) | ||
| 28 | @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ | 34 | @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ |
| 29 | $(MAKE) tests ; fi) | 35 | $(MAKE) tests ; fi) |
| 30 | 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) | ||
| 31 | diff -uNr a/runsuite.c b/runsuite.c | 46 | diff -uNr a/runsuite.c b/runsuite.c |
| 32 | --- a/runsuite.c 2013-04-12 16:17:11.462823238 +0200 | 47 | --- a/runsuite.c 2013-04-12 16:17:11.462823238 +0200 |
| 33 | +++ b/runsuite.c 2013-04-17 14:07:24.352693211 +0200 | 48 | +++ b/runsuite.c 2013-04-17 14:07:24.352693211 +0200 |