anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove layout and tex2lyx tests from make check

Browse Source 
These tests need a built and configured LyX, so they do not work in the
distcheck target. They can now be called with make alltests.
This commit is contained in:
Georg Baum 2013-09-09 21:00:11 +02:00
parent 72f70cbe5e
commit 592deaa423
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -46,7 +46,7 @@ rpmdist: dist
rm lyx.png; exit $$saved_status rm lyx.png; exit $$saved_status
doxydoc: doxydoc:
cd sourcedoc; make doxydoc cd sourcedoc; $(MAKE) doxydoc
lfundoc: lfundoc:
development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx
@ -54,8 +54,16 @@ lfundoc:
keystest: keystest:
development/keystest/lyx_make.sh development/keystest/lyx_make.sh
alltests: check alltests-recursive
alltests-recursive:
cd src; $(MAKE) alltests-recursive
updatetests:
cd src; $(MAKE) updatetests
lgbtags: lgbtags:
etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/* etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
.PHONY: doxydoc .PHONY: doxydoc alltests alltests-recursive updatetests

15
src/Makefile.am
View File

@ -668,9 +668,19 @@ endif
EXTRA_DIST += \ EXTRA_DIST += \
tests/test_layout tests/test_layout
alltests: check alltests-recursive
TESTS = \ alltests-recursive: check_layout
tests/test_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_PROGRAMS = \
check_layout check_layout
@ -699,3 +709,4 @@ check_layout_SOURCES = \
support/tests/boost.cpp \ support/tests/boost.cpp \
support/tests/dummy_functions.cpp support/tests/dummy_functions.cpp
.PHONY: alltests alltests-recursive updatetests

13
src/tex2lyx/Makefile.am
View File

@ -53,7 +53,16 @@ TEST_RESULTS = \
test/verbatim.lyx.lyx \ test/verbatim.lyx.lyx \
test/XeTeX-polyglossia.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 updatetests: tex2lyx
$(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test" $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test"
@ -107,3 +116,5 @@ tex2lyx_LDADD = \
if INSTALL_MACOSX if INSTALL_MACOSX
tex2lyx_LDFLAGS = -framework AppKit tex2lyx_LDFLAGS = -framework AppKit
endif endif
.PHONY: alltests alltests-recursive updatetests