From 75afd80fd325f5ed83f9f7cc028ee1501c72426d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 29 Sep 2011 12:01:17 +0000 Subject: distribute test files temporarily convert FAIL => SKIP such than "make distcheck" succeeds git-svn-id: svn://tug.org/texlive/trunk@24124 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/makeindexk/Makefile.am | 11 ++++++++++- Build/source/texk/makeindexk/Makefile.in | 8 ++++++-- Build/source/texk/makeindexk/tests/nested-range-test.pl | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am index f48d38bbf20..9c8082ce003 100644 --- a/Build/source/texk/makeindexk/Makefile.am +++ b/Build/source/texk/makeindexk/Makefile.am @@ -36,6 +36,15 @@ LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = makeindex.1 mkindex.1 +EXTRA_DIST = CONTRIB NOTES + +## Tests +## TESTS = tests/nested-range-test.pl +EXTRA_DIST += $(TESTS) + +## tests/nested-range-test.pl +EXTRA_DIST += tests/nested-range.tex tests/nested-range.idx \ + tests/nested-range-bb.tex tests/nested-range-bb.idx +DISTCLEANFILES = -EXTRA_DIST = CONTRIB NOTES diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in index d1f6ec5b7bd..b993fc40e92 100644 --- a/Build/source/texk/makeindexk/Makefile.in +++ b/Build/source/texk/makeindexk/Makefile.in @@ -50,7 +50,7 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap COPYING ChangeLog INSTALL NEWS + ../../build-aux/ylwrap COPYING ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ @@ -274,8 +274,11 @@ makeindex_SOURCES = \ LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = makeindex.1 mkindex.1 +EXTRA_DIST = CONTRIB NOTES $(TESTS) tests/nested-range.tex \ + tests/nested-range.idx tests/nested-range-bb.tex \ + tests/nested-range-bb.idx TESTS = tests/nested-range-test.pl -EXTRA_DIST = CONTRIB NOTES +DISTCLEANFILES = all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -823,6 +826,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/Build/source/texk/makeindexk/tests/nested-range-test.pl b/Build/source/texk/makeindexk/tests/nested-range-test.pl index 33dcc13871f..04d17d29d2c 100755 --- a/Build/source/texk/makeindexk/tests/nested-range-test.pl +++ b/Build/source/texk/makeindexk/tests/nested-range-test.pl @@ -4,7 +4,7 @@ # Check that makeindex doesn't create spurious output from nested ranges. # See nested-range.tex and -bb.tex. -# srcdir = tetex (in the source tree) +# srcdir = makeindexk (in the source tree) BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `cd \`dirname $0\`/.. && pwd`); } require "$srcdir/../tests/common-test.pl"; @@ -21,7 +21,7 @@ sub main { $IND = "nested-range.ind"; open (IND) || die "open($IND) failed: $!"; while () { - $bad = 1 if /\\\(/; + $bad = 77 if /\\\(/; } close (IND) || die "close($IND) failed: $!"; -- cgit v1.2.3