Re: Fix "make distcheck"
Op 9-9-2013 21:47, Pavel Sanda schreef: Vincent van Ravesteijn wrote: Op 9-9-2013 1:55, Pavel Sanda schreef: Georg Baum wrote: OK to go in? I tested this patch helps here. We are still having the problem I registered some time ago with cleaning up the tree from new pot files: It works for me. Yep, JMarc committed fix some hours back.Pavel Yes, I meant that the patch from Georg in combination with JMarc's commit fixed all the make distcheck problems also for me. Vincent
Re: Fix "make distcheck"
Vincent van Ravesteijn wrote: > Op 9-9-2013 1:55, Pavel Sanda schreef: >> Georg Baum wrote: >>> OK to go in? >> I tested this patch helps here. >> >> We are still having the problem I registered some time ago with >> cleaning up the tree from new pot files: > > It works for me. Yep, JMarc committed fix some hours back.Pavel
Re: Fix "make distcheck"
Vincent van Ravesteijn wrote: > I noticed that in src/Makefile.am there is still "check_PROGRAMS: > check_layout" left. I guess this should be removed. That was my first thought as well, but it does not work if you remove this: There would be no rule to build check_layout. I'll submit the patch in a minute. Georg
Re: Fix "make distcheck"
Op 9-9-2013 1:55, Pavel Sanda schreef: Georg Baum wrote: OK to go in? I tested this patch helps here. We are still having the problem I registered some time ago with cleaning up the tree from new pot files: It works for me. Vincent
Re: Fix "make distcheck"
Op 8-9-2013 19:40, Georg Baum schreef: Vincent van Ravesteijn wrote: Ok, thanks for having a look at it. I came up with a rather basic version. I did not test the new targets with anything else than GNU make and GNU bash, but since they are mainly for our own use I don't consider this a problem. The main goal (not having the tests in make checks) works on any autotools supported system anyway. OK to go in? Georg I noticed that in src/Makefile.am there is still "check_PROGRAMS: check_layout" left. I guess this should be removed. Vincent
Re: Fix "make distcheck"
Jean-Marc Lasgouttes wrote: > Is it OK now? What I did is to avoid keeping the files in the first place. Seems to work. Pavel
Re: Fix "make distcheck"
09/09/2013 01:55, Pavel Sanda: We are still having the problem I registered some time ago with cleaning up the tree from new pot files: ERROR: files left in build directory after distclean: ./po/languages_l10n.pot ./po/qt4_l10n.pot ./po/layouts_l10n.pot ./po/formats_l10n.pot ./po/latexfonts_l10n.pot ./po/ui_l10n.pot ./po/encodings_l10n.pot ./po/external_l10n.pot make[1]: *** [distcleancheck] Error 1 Is it OK now? What I did is to avoid keeping the files in the first place. JMarc
Re: Fix "make distcheck"
Op 8-9-2013 19:40, Georg Baum schreef: Vincent van Ravesteijn wrote: Ok, thanks for having a look at it. I came up with a rather basic version. I did not test the new targets with anything else than GNU make and GNU bash, but since they are mainly for our own use I don't consider this a problem. The main goal (not having the tests in make checks) works on any autotools supported system anyway. OK to go in? Yes, please put it in. Vincent
Re: Fix "make distcheck"
Georg Baum wrote: > OK to go in? I tested this patch helps here. We are still having the problem I registered some time ago with cleaning up the tree from new pot files: ERROR: files left in build directory after distclean: ./po/languages_l10n.pot ./po/qt4_l10n.pot ./po/layouts_l10n.pot ./po/formats_l10n.pot ./po/latexfonts_l10n.pot ./po/ui_l10n.pot ./po/encodings_l10n.pot ./po/external_l10n.pot make[1]: *** [distcleancheck] Error 1 But that's unrelated to the current patch. Thanks, Pavel
Re: Fix "make distcheck"
Vincent van Ravesteijn wrote: > Ok, thanks for having a look at it. I came up with a rather basic version. I did not test the new targets with anything else than GNU make and GNU bash, but since they are mainly for our own use I don't consider this a problem. The main goal (not having the tests in make checks) works on any autotools supported system anyway. OK to go in? Georgdiff --git a/Makefile.am b/Makefile.am index 6df1254..5c9e788 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ rpmdist: dist rm lyx.png; exit $$saved_status doxydoc: - cd sourcedoc; make doxydoc + cd sourcedoc; $(MAKE) doxydoc lfundoc: development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx @@ -54,8 +54,16 @@ lfundoc: keystest: development/keystest/lyx_make.sh +alltests: check alltests-recursive + +alltests-recursive: + cd src; $(MAKE) alltests-recursive + +updatetests: + cd src; $(MAKE) updatetests + lgbtags: etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/* -.PHONY: doxydoc +.PHONY: doxydoc alltests alltests-recursive updatetests diff --git a/src/Makefile.am b/src/Makefile.am index 17c7a25..024cf45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -668,9 +668,19 @@ endif EXTRA_DIST += \ tests/test_layout +alltests: check alltests-recursive -TESTS = \ - tests/test_layout +alltests-recursive: check_layout + @srcdir=$(srcdir) $(srcdir)/tests/test_layout; \ + if test $$? -eq 0; then \ + echo -e "\nlayout tests passed.\n"; \ + else \ + echo -e "\nlayout tests failed.\n"; \ + fi + cd tex2lyx; $(MAKE) alltests-recursive + +updatetests: + cd tex2lyx; $(MAKE) updatetests check_PROGRAMS = \ check_layout @@ -699,3 +709,4 @@ check_layout_SOURCES = \ support/tests/boost.cpp \ support/tests/dummy_functions.cpp +.PHONY: alltests alltests-recursive updatetests diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 9ebbdc0..2cbe658 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -53,7 +53,16 @@ TEST_RESULTS = \ test/verbatim.lyx.lyx \ test/XeTeX-polyglossia.lyx.lyx -TESTS = test/runtests.py +alltests: check alltests-recursive + +alltests-recursive: tex2lyx + @$(PYTHON) "$(srcdir)/test/runtests.py"; \ + if test $$? -eq 0; then \ + echo -e "=\ntex2lyx tests passed.\n="; \ + else \ + echo -e "=\ntex2lyx tests failed.\n="; \ + fi + updatetests: tex2lyx $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test" @@ -107,3 +116,5 @@ tex2lyx_LDADD = \ if INSTALL_MACOSX tex2lyx_LDFLAGS = -framework AppKit endif + +.PHONY: alltests alltests-recursive updatetests
Re: Fix "make distcheck"
Op 3-9-2013 21:12, Georg Baum schreef: Vincent van Ravesteijn wrote: Is there any volunteer that wants to fix the Autotools "distcheck" target ? This basically comes down to stripping the new tests from the "check" target and to introduce a different target to run the tests. I'm not that experienced with Makefiles, that's why I'm asking. I tried it yesterday, but did not get a working result. Basically, the automake test support is too basic, and one has to re-invent the wheel. I'll continue with the work unless somebody else has a better idea, but don't expect anything before the weekend. Georg Ok, thanks for having a look at it. Vincent
Re: Fix "make distcheck"
Vincent van Ravesteijn wrote: > Is there any volunteer that wants to fix the Autotools "distcheck" target > ? > > This basically comes down to stripping the new tests from the "check" > target and to introduce a different target to run the tests. > > I'm not that experienced with Makefiles, that's why I'm asking. I tried it yesterday, but did not get a working result. Basically, the automake test support is too basic, and one has to re-invent the wheel. I'll continue with the work unless somebody else has a better idea, but don't expect anything before the weekend. Georg
