Re: FYI, 11 mostly-test-related patches

[Jim Meyering]

Bo Borgerson <address@hidden> wrote:
> Eric Blake wrote:
>> I'm now seeing this when running ./bootstrap:
>>
>> ./bootstrap: m4/xsize.m4 overrides ._bootmp2/m4/xsize.m4
>> Undefined subroutine &Test::test_vector called at tests/mk-script line 44.
>> ./bootstrap: aclocal --force -I m4 ...
>>
>> and am not yet sure if it is from one of these patches or from an external
>> change of upgrading from perl 5.8.8 to 5.10.0.
>>
>
> Hmm... I'm not seeing that (still on 5.8.8 here).
>
> But I _am_ seeing some warnings about trying to mess around in
> `tests/wc', which doesn't seem to exist anymore.
>
> ----
> ./bootstrap: cp -f ._bootmp2/po/remove-potcdate.sin po/remove-potcdate.sin
> ./bootstrap: 537: cannot create tests/wc/Makefile.amt: Directory nonexistent
> ./bootstrap: 537: cannot create tests/wc/Makefile.amt: Directory nonexistent
> ./bootstrap: 537: cannot create tests/wc/Makefile.amt: Directory nonexistent
> ./bootstrap: 537: cannot create tests/wc/Makefile.amt: Directory nonexistent
> chmod: cannot access `tests/wc/Makefile.amt': No such file or directory
> mv: cannot stat `tests/wc/Makefile.amt': No such file or directory
> ./bootstrap: aclocal --force -I m4 ...
>
> I've attached a patch that addresses this.

Thanks to both of you.
Bo, I've applied your patch.

FYI, here's one more, that will eliminate the risk of my making
that mistake again ;-)

>From 28f1b61e594eeb91658e8db392d8911a4485dc7a Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 28 Apr 2008 22:59:24 +0200
Subject: [PATCH] tests: don't hard-code coreutils list of tests/ SUBDIRS in 
bootstrap

* bootstrap: Extract the list from tests/Makefile.am, and die
when it is empty -- it will be, eventually.
---
 bootstrap |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/bootstrap b/bootstrap
index c4b9b62..9e35444 100755
--- a/bootstrap
+++ b/bootstrap
@@ -535,7 +535,9 @@ fi
 mam_template=tests/Makefile.am.in
 if test -f $mam_template; then
   PERL=perl
-  for tool in cut head join pr sort tac tail test tr uniq; do
+  tool_subdirs=`$PERL -ne '/^SUBDIRS = (.*)/ and print $1' tests/Makefile.am`
+  test "$tool_subdirs" = '' && { echo "$0: no more SUBDIRS: FIXME"1>&2; exit 
1;}
+  for tool in $tool_subdirs; do
     m=tests/$tool/Makefile.am
     t=${m}t
     rm -f $m $t
--
1.5.5.1.68.gbdcd8