automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: missing*.test failures on Tru64; 'required=' lines


From: Ralf Wildenhues
Subject: Re: missing*.test failures on Tru64; 'required=' lines
Date: Thu, 11 May 2006 19:34:37 +0200
User-agent: Mutt/1.5.11+cvs20060403

* Alexandre Duret-Lutz wrote on Wed, May 10, 2006 at 11:31:22PM CEST:
> >>> "RW" == Ralf Wildenhues <address@hidden> writes:
> 
>  RW> * tests/missing.test, tests/missing2.test, tests/missing4.test:
>  RW> Add some $sleep, for Tru64 make on NFS.
>  RW> * tests/missing.test, tests/missing2.test: Do not require
>  RW> GNUmake.
>  RW> * Makefile.am (maintainer-check): Make sure `required=' does not
>  RW> follow `. ./defs' in the tests.
> 
> I agree with this except for the added sleeps.  Unless the problem is
> generalized I don't think we should include workarounds for any 
> misconfigured system we encounter.

Fair enough.  I installed only the `required=' fixes, like this:

Cheers,
Ralf

        * tests/missing.test, tests/missing2.test: Do not require
        GNUmake.
        * Makefile.am (maintainer-check): Make sure `required=' does not
        follow `. ./defs' in the tests.

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.242
diff -u -r1.242 Makefile.am
--- Makefile.am 12 Jan 2006 20:11:48 -0000      1.242
+++ Makefile.am 11 May 2006 17:32:15 -0000
@@ -225,6 +225,13 @@
          echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 
1>&2; \
          exit 1; \
        fi
+## Setting `required' after sourcing `./defs' is a bug.
+       @for file in $(srcdir)/tests/*.test; do \
+         if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; 
then \
+           echo 'Do not set "required" after sourcing "defs" in '"$$file: 
$$out" 1>&2; \
+           exit 1; \
+         fi; \
+       done
 ## Overriding a Makefile macro on the command line is not portable when
 ## recursive targets are used.  Better use an envvar.  SHELL is an exception,
 ## POSIX says it can't come from the environment.
Index: tests/missing.test
===================================================================
RCS file: /cvs/automake/automake/tests/missing.test,v
retrieving revision 1.3
diff -u -r1.3 missing.test
--- tests/missing.test  14 May 2005 20:28:55 -0000      1.3
+++ tests/missing.test  11 May 2006 17:32:15 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,7 +22,6 @@
 
 . ./defs || exit 1
 
-required=GNUmake
 set -e
 
 cat >>configure.in <<'EOF'
Index: tests/missing2.test
===================================================================
RCS file: /cvs/automake/automake/tests/missing2.test,v
retrieving revision 1.3
diff -u -r1.3 missing2.test
--- tests/missing2.test 14 May 2005 20:28:55 -0000      1.3
+++ tests/missing2.test 11 May 2006 17:32:15 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,7 +22,6 @@
 
 . ./defs || exit 1
 
-required=GNUmake
 set -e
 
 cat >>configure.in <<'EOF'




reply via email to

[Prev in Thread] Current Thread [Next in Thread]