From 8e7e29d1de6823fc4f4e98c873c58d904a1e7b36 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 18 Jan 2002 23:56:32 +0000 Subject: . --- tests/cut/Makefile.in | 7 +++++-- tests/fmt/Makefile.in | 7 +++++-- tests/head/Makefile.in | 7 +++++-- tests/join/Makefile.in | 7 +++++-- tests/md5sum/Makefile.in | 7 +++++-- tests/misc/Makefile.in | 12 ++++++++---- tests/od/Makefile.in | 7 +++++-- tests/pr/Makefile.in | 7 +++++-- tests/sha1sum/Makefile.in | 7 +++++-- tests/sort/Makefile.in | 7 +++++-- tests/sum/Makefile.in | 7 +++++-- tests/tac/Makefile.in | 7 +++++-- tests/tail-2/Makefile.in | 7 +++++-- tests/tail/Makefile.in | 7 +++++-- tests/tr/Makefile.in | 13 +++++++++---- tests/tsort/Makefile.in | 7 +++++-- tests/unexpand/Makefile.in | 7 +++++-- tests/uniq/Makefile.in | 7 +++++-- tests/wc/Makefile.in | 7 +++++-- 19 files changed, 102 insertions(+), 42 deletions(-) (limited to 'tests') diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in index f56edb337..8f97b50ac 100644 --- a/tests/cut/Makefile.in +++ b/tests/cut/Makefile.in @@ -231,10 +231,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in index 2c2c8fdcc..e9a418c93 100644 --- a/tests/fmt/Makefile.in +++ b/tests/fmt/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in index 7e7608a7f..874067079 100644 --- a/tests/head/Makefile.in +++ b/tests/head/Makefile.in @@ -228,10 +228,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in index fef255593..2dce70fec 100644 --- a/tests/join/Makefile.in +++ b/tests/join/Makefile.in @@ -231,10 +231,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in index b22a9d375..df89cf0c1 100644 --- a/tests/md5sum/Makefile.in +++ b/tests/md5sum/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in index 872257178..9651a0ccc 100644 --- a/tests/misc/Makefile.in +++ b/tests/misc/Makefile.in @@ -120,10 +120,11 @@ TESTS_ENVIRONMENT = \ top_srcdir=$(top_srcdir) \ srcdir=$(srcdir) \ PERL="@PERL@" \ - PATH=`pwd`/../../src:$$PATH + PATH=`pwd`/../../src:$$PATH \ + PROG=$$tst -TESTS = head-c csplit +TESTS = sort head-c csplit subdir = tests/misc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -207,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in index 046fe26ac..f61689961 100644 --- a/tests/od/Makefile.in +++ b/tests/od/Makefile.in @@ -207,10 +207,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in index 434bfa4d5..5ebd63adf 100644 --- a/tests/pr/Makefile.in +++ b/tests/pr/Makefile.in @@ -281,10 +281,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in index 58287f869..7ac9c7336 100644 --- a/tests/sha1sum/Makefile.in +++ b/tests/sha1sum/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in index 558c6bba4..eaaa7b05e 100644 --- a/tests/sort/Makefile.in +++ b/tests/sort/Makefile.in @@ -252,10 +252,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in index 3e278e7da..907d7de23 100644 --- a/tests/sum/Makefile.in +++ b/tests/sum/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in index 28644fab2..dc9c45f91 100644 --- a/tests/tac/Makefile.in +++ b/tests/tac/Makefile.in @@ -229,10 +229,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in index 869dba0b5..99f09b8ee 100644 --- a/tests/tail-2/Makefile.in +++ b/tests/tail-2/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in index 4403c8135..a339c6139 100644 --- a/tests/tail/Makefile.in +++ b/tests/tail/Makefile.in @@ -231,10 +231,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in index 6fe20b5ec..43c698772 100644 --- a/tests/tr/Makefile.in +++ b/tests/tr/Makefile.in @@ -125,7 +125,8 @@ range-a-a.X null.I null.X upcase.I upcase.X dncase.I dncase.X rep-cclass.I \ rep-cclass.X rep-1.I rep-1.X rep-2.I rep-2.X rep-3.I rep-3.X o-rep-1.I \ o-rep-1.X o-rep-2.I o-rep-2.X esc.I esc.X ross-0a.I ross-0a.X ross-0b.I \ ross-0b.X ross-1a.I ross-1a.X ross-1b.I ross-1b.X ross-2.I ross-2.X ross-3.I \ -ross-3.X ross-4.I ross-4.X ross-5.I ross-5.X ross-6.I ross-6.X +ross-3.X ross-4.I ross-4.X ross-5.I ross-5.X ross-6.I ross-6.X empty-eq.I \ +empty-eq.X empty-cc.I empty-cc.X run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \ 9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \ @@ -135,7 +136,8 @@ range-a-a.E null.O null.E upcase.O upcase.E dncase.O dncase.E rep-cclass.O \ rep-cclass.E rep-1.O rep-1.E rep-2.O rep-2.E rep-3.O rep-3.E o-rep-1.O \ o-rep-1.E o-rep-2.O o-rep-2.E esc.O esc.E ross-0a.O ross-0a.E ross-0b.O \ ross-0b.E ross-1a.O ross-1a.E ross-1b.O ross-1b.E ross-2.O ross-2.E ross-3.O \ -ross-3.E ross-4.O ross-4.E ross-5.O ross-5.E ross-6.O ross-6.E +ross-3.E ross-4.O ross-4.E ross-5.O ross-5.E ross-6.O ross-6.E empty-eq.O \ +empty-eq.E empty-cc.O empty-cc.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) @@ -233,10 +235,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in index 9ec8e4b78..069e484b7 100644 --- a/tests/tsort/Makefile.in +++ b/tests/tsort/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in index 64aad3d64..68e592889 100644 --- a/tests/unexpand/Makefile.in +++ b/tests/unexpand/Makefile.in @@ -208,10 +208,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in index 107eb2039..7efd08f68 100644 --- a/tests/uniq/Makefile.in +++ b/tests/uniq/Makefile.in @@ -233,10 +233,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in index 047603ee3..39f18a1c9 100644 --- a/tests/wc/Makefile.in +++ b/tests/wc/Makefile.in @@ -221,10 +221,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ + cp -pR $$d/$$file $(distdir)$$dir \ || exit 1; \ else \ test -f $(distdir)/$$file \ -- cgit v1.2.3-54-g00ecf