diff options
-rw-r--r-- | meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch b/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch index d1ad55116a..2b92dbc8dc 100644 --- a/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch +++ b/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch | |||
@@ -15,12 +15,12 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | |||
15 | python/tests/tstLastError.py | 2 +- | 15 | python/tests/tstLastError.py | 2 +- |
16 | 4 files changed, 21 insertions(+), 4 deletions(-) | 16 | 4 files changed, 21 insertions(+), 4 deletions(-) |
17 | 17 | ||
18 | diff --git a/Makefile.am b/Makefile.am | 18 | Index: libxml2-2.9.7/Makefile.am |
19 | index e181ee0..7960e7d 100644 | 19 | =================================================================== |
20 | --- a/Makefile.am | 20 | --- libxml2-2.9.7.orig/Makefile.am |
21 | +++ b/Makefile.am | 21 | +++ libxml2-2.9.7/Makefile.am |
22 | @@ -207,9 +207,9 @@ install-ptest: | 22 | @@ -207,9 +207,9 @@ install-ptest: |
23 | install $(noinst_PROGRAMS) $(DESTDIR)) | 23 | install $(check_PROGRAMS) $(DESTDIR)) |
24 | cp -r $(srcdir)/test $(DESTDIR) | 24 | cp -r $(srcdir)/test $(DESTDIR) |
25 | cp -r $(srcdir)/result $(DESTDIR) | 25 | cp -r $(srcdir)/result $(DESTDIR) |
26 | - cp -r $(srcdir)/python $(DESTDIR) | 26 | - cp -r $(srcdir)/python $(DESTDIR) |
@@ -28,13 +28,13 @@ index e181ee0..7960e7d 100644 | |||
28 | sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile | 28 | sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile |
29 | + $(MAKE) -C python install-ptest | 29 | + $(MAKE) -C python install-ptest |
30 | 30 | ||
31 | runtests: | 31 | runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ |
32 | [ -d test ] || $(LN_S) $(srcdir)/test . | 32 | testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) |
33 | diff --git a/python/Makefile.am b/python/Makefile.am | 33 | Index: libxml2-2.9.7/python/Makefile.am |
34 | index 34aed96..ba3ec6a 100644 | 34 | =================================================================== |
35 | --- a/python/Makefile.am | 35 | --- libxml2-2.9.7.orig/python/Makefile.am |
36 | +++ b/python/Makefile.am | 36 | +++ libxml2-2.9.7/python/Makefile.am |
37 | @@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES) | 37 | @@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class |
38 | 38 | ||
39 | $(GENERATED): $(srcdir)/generator.py $(API_DESC) | 39 | $(GENERATED): $(srcdir)/generator.py $(API_DESC) |
40 | $(PYTHON) $(srcdir)/generator.py $(srcdir) | 40 | $(PYTHON) $(srcdir)/generator.py $(srcdir) |
@@ -51,10 +51,10 @@ index 34aed96..ba3ec6a 100644 | |||
51 | +.PHONY: tests test | 51 | +.PHONY: tests test |
52 | tests test: all | 52 | tests test: all |
53 | cd tests && $(MAKE) tests | 53 | cd tests && $(MAKE) tests |
54 | diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am | 54 | Index: libxml2-2.9.7/python/tests/Makefile.am |
55 | index 95ebead..418e21e 100644 | 55 | =================================================================== |
56 | --- a/python/tests/Makefile.am | 56 | --- libxml2-2.9.7.orig/python/tests/Makefile.am |
57 | +++ b/python/tests/Makefile.am | 57 | +++ libxml2-2.9.7/python/tests/Makefile.am |
58 | @@ -59,6 +59,11 @@ XMLS= \ | 58 | @@ -59,6 +59,11 @@ XMLS= \ |
59 | CLEANFILES = core tmp.xml *.pyc | 59 | CLEANFILES = core tmp.xml *.pyc |
60 | 60 | ||
@@ -81,10 +81,10 @@ index 95ebead..418e21e 100644 | |||
81 | + | 81 | + |
82 | tests: | 82 | tests: |
83 | endif | 83 | endif |
84 | diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py | 84 | Index: libxml2-2.9.7/python/tests/tstLastError.py |
85 | index d5f9be7..3e5bef8 100755 | 85 | =================================================================== |
86 | --- a/python/tests/tstLastError.py | 86 | --- libxml2-2.9.7.orig/python/tests/tstLastError.py |
87 | +++ b/python/tests/tstLastError.py | 87 | +++ libxml2-2.9.7/python/tests/tstLastError.py |
88 | @@ -25,7 +25,7 @@ class TestCase(unittest.TestCase): | 88 | @@ -25,7 +25,7 @@ class TestCase(unittest.TestCase): |
89 | when the exception is raised, check the libxml2.lastError for | 89 | when the exception is raised, check the libxml2.lastError for |
90 | expected values.""" | 90 | expected values.""" |
@@ -94,6 +94,3 @@ index d5f9be7..3e5bef8 100755 | |||
94 | try: | 94 | try: |
95 | f(*args) | 95 | f(*args) |
96 | except exc: | 96 | except exc: |
97 | -- | ||
98 | 2.12.0 | ||
99 | |||