| 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 |
| |