mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 02:33:02 +01:00
91ffc0a96c
Drop CVE patches which are fixed by the new upstream version. Modify conflicting patches to apply to the new versions: libxml2/libxml-m4-use-pkgconfig.patch libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch Drop fix-python39, which is merged upstream. Removed hunk for tstLastError.py from libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch since it has been fixed upstream by: 8c3e52e: Updated python/tests/tstLastError.py libxml2.registerErrorHandler(None,None): None is not acceptable as first argument failUnlessEqual replaced by assertEqual The checksums for the licence file changed because a typo was fixed across the files. The licence remains the same. The obsolete MD5 checksums for the tar files have been dropped in favor of SHA256. The new release also adds fuzz tests, which are removed from the makefile to allow the ptests to run. Fuzz testing is done upstream and there is no need to run them as part of ptests which are intended for functionality testing. (From OE-Core rev: c7c429d05ca51b0404f09981f6c9bcad7dc33222) Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
87 lines
2.6 KiB
Diff
87 lines
2.6 KiB
Diff
From ea1993d1d9a18c5e61b9cb271892b0a48f508d32 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 | 10 ++++++++++
|
|
3 files changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index b428452b..dc18d6dd 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -203,9 +203,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)
|
|
diff --git a/python/Makefile.am b/python/Makefile.am
|
|
index 34aed96c..ba3ec6a4 100644
|
|
--- a/python/Makefile.am
|
|
+++ b/python/Makefile.am
|
|
@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES)
|
|
|
|
$(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
|
|
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
|
|
index 227e24df..3568c2d2 100644
|
|
--- a/python/tests/Makefile.am
|
|
+++ b/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"
|
|
@@ -70,9 +75,14 @@ tests: $(PYTESTS)
|
|
if [ "$$?" -ne 0 ] ; then \
|
|
echo "-- $$test" ; \
|
|
echo "$$log" ; \
|
|
+ echo "FAIL: $$test"; \
|
|
exit 1 ; \
|
|
+ else \
|
|
+ echo "PASS: $$test"; \
|
|
fi ; \
|
|
done)
|
|
else
|
|
+install-ptest:
|
|
+
|
|
tests:
|
|
endif
|
|
--
|
|
2.25.1
|
|
|