mirror of
https://git.yoctoproject.org/poky
synced 2026-02-08 09:46:38 +01:00
395a4c8aee
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: d71d6854fadc96fc3c75617af3beba02952fdef6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
97 lines
3.4 KiB
Diff
97 lines
3.4 KiB
Diff
From 78dbd4c09d617a9cb730d796f94ee4d93840d3cc Mon Sep 17 00:00:00 2001
|
|
From: Peter Kjellerstedt <pkj@axis.com>
|
|
Date: Fri, 9 Jun 2017 17:50:46 +0200
|
|
Subject: [PATCH] Make ptest run the python tests if python is enabled
|
|
|
|
One of the tests (tstLastError.py) needed a minor correction. It might
|
|
be due to the fact that the tests are forced to run with Python 3.
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
|
---
|
|
Makefile.am | 2 +-
|
|
python/Makefile.am | 9 +++++++++
|
|
python/tests/Makefile.am | 12 ++++++++++--
|
|
python/tests/tstLastError.py | 2 +-
|
|
4 files changed, 21 insertions(+), 4 deletions(-)
|
|
|
|
Index: libxml2-2.9.7/Makefile.am
|
|
===================================================================
|
|
--- libxml2-2.9.7.orig/Makefile.am
|
|
+++ libxml2-2.9.7/Makefile.am
|
|
@@ -207,9 +207,9 @@ install-ptest:
|
|
install $(check_PROGRAMS) $(DESTDIR))
|
|
cp -r $(srcdir)/test $(DESTDIR)
|
|
cp -r $(srcdir)/result $(DESTDIR)
|
|
- cp -r $(srcdir)/python $(DESTDIR)
|
|
cp Makefile $(DESTDIR)
|
|
sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile
|
|
+ $(MAKE) -C python install-ptest
|
|
|
|
runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
|
|
testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
|
|
Index: libxml2-2.9.7/python/Makefile.am
|
|
===================================================================
|
|
--- libxml2-2.9.7.orig/python/Makefile.am
|
|
+++ libxml2-2.9.7/python/Makefile.am
|
|
@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class
|
|
|
|
$(GENERATED): $(srcdir)/generator.py $(API_DESC)
|
|
$(PYTHON) $(srcdir)/generator.py $(srcdir)
|
|
+
|
|
+install-ptest:
|
|
+ cp -r $(srcdir) $(DESTDIR)
|
|
+ sed -e 's|^Makefile:|_Makefile:|' \
|
|
+ -e 's|^\(tests test:\) all|\1|' Makefile >$(DESTDIR)/python/Makefile
|
|
+ $(MAKE) -C tests install-ptest
|
|
+else
|
|
+install-ptest:
|
|
endif
|
|
|
|
+.PHONY: tests test
|
|
tests test: all
|
|
cd tests && $(MAKE) tests
|
|
Index: libxml2-2.9.7/python/tests/Makefile.am
|
|
===================================================================
|
|
--- libxml2-2.9.7.orig/python/tests/Makefile.am
|
|
+++ libxml2-2.9.7/python/tests/Makefile.am
|
|
@@ -59,6 +59,11 @@ XMLS= \
|
|
CLEANFILES = core tmp.xml *.pyc
|
|
|
|
if WITH_PYTHON
|
|
+install-ptest:
|
|
+ cp -r $(srcdir) $(DESTDIR)/python
|
|
+ sed -e 's|^Makefile:|_Makefile:|' \
|
|
+ -e 's|^\(srcdir = \).*|\1.|' Makefile >$(DESTDIR)/python/tests/Makefile
|
|
+
|
|
tests: $(PYTESTS)
|
|
@for f in $(XMLS) ; do test -f $$f || $(LN_S) $(srcdir)/$$f . ; done
|
|
@echo "## running Python regression tests"
|
|
@@ -68,8 +73,11 @@ tests: $(PYTESTS)
|
|
export LD_LIBRARY_PATH; \
|
|
for test in $(PYTESTS) ; \
|
|
do log=`$(PYTHON) $(srcdir)/$$test` ; \
|
|
- if [ "`echo $$log | grep OK`" = "" ] ; then \
|
|
- echo "-- $$test" ; echo "$$log" ; fi ; done)
|
|
+ if [ "`echo $$log | grep OK`" ]; then \
|
|
+ echo "PASS: $$test"; else \
|
|
+ echo "$$log"; echo "FAIL: $$test"; fi; done)
|
|
else
|
|
+install-ptest:
|
|
+
|
|
tests:
|
|
endif
|
|
Index: libxml2-2.9.7/python/tests/tstLastError.py
|
|
===================================================================
|
|
--- libxml2-2.9.7.orig/python/tests/tstLastError.py
|
|
+++ libxml2-2.9.7/python/tests/tstLastError.py
|
|
@@ -25,7 +25,7 @@ class TestCase(unittest.TestCase):
|
|
when the exception is raised, check the libxml2.lastError for
|
|
expected values."""
|
|
# disable the default error handler
|
|
- libxml2.registerErrorHandler(None,None)
|
|
+ libxml2.registerErrorHandler(lambda ctx,str: None,None)
|
|
try:
|
|
f(*args)
|
|
except exc:
|