automake-patches
[Top][All Lists]
Advanced

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

[PATCH] tests: avoid spurious new makefile-deps failure


From: Jim Meyering
Subject: [PATCH] tests: avoid spurious new makefile-deps failure
Date: Sun, 12 Feb 2012 16:04:19 +0100

I noticed this an hour or two ago:

  FAIL: makefile-deps
  ===================

  Running from installcheck: no
  Using TAP: no
  PATH = 
/h/j/w/co/automake/tests:/opt/cov-sa-linux64-5.4.0/bin:/usr/lib64/ccache:/h/j/bin/perl:/h/j/bin:/p/p/git/bin:/p/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local:/usr/local/bin
  ++ pwd
  /h/j/w/co/automake/tests/makefile-deps.dir
  + :
  + aclocal-1.11a -Werror
  + automake-1.11a --foreign -Werror -Wall
  + grep '^ *:' Makefile.in
          :) ;; \
  + Exit 1
  + set +e
  + test 77 = 1
  + exit 1
  + exit 1
  + exit_status=1
  + set +e
  + cd /h/j/w/co/automake/tests
  + test no = yes
  + case $am_explicit_skips in
  + test 1 -eq 0
  + keep_testdirs=yes
  + am_keeping_testdirs
  + case $keep_testdirs in
  + return 0
  + set +x
  makefile-deps: exit 1

That's due to this new part of every Makefile.in:

    $ grep -C5 '^ *:' Makefile.in
    am__make_dryrun = \
      { \
        am__dry=no; \
        for am__flg in : $(MAKEFLAGS); do \
          case $$am__flg in \
            :) ;; \
            *=*|--*) ;; \
            *n*) am__dry=yes; break;; \
          esac; \
        done; \
        test $$am__dry = yes; \


Here's one way to fix it:

I hesitated to update copyright (what's automake's policy?)
since I'm used to performing a mass-update in early January so
that patches aren't constantly polluted with a distracting
copyright-updating hunk throughout each year.

>From e6b2bba9f195e2f268c8a7bd94fb364d95e68386 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 12 Feb 2012 16:01:54 +0100
Subject: [PATCH] tests: avoid spurious new makefile-deps failure

* tests/makefile-deps.test: Tighten regexp to avoid matching
this new line of every Makefile.in: "            :) ;; \"
---
 tests/makefile-deps.test |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/makefile-deps.test b/tests/makefile-deps.test
index bfe0d67..4c48f6e 100755
--- a/tests/makefile-deps.test
+++ b/tests/makefile-deps.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +24,6 @@
 $ACLOCAL
 $AUTOMAKE

-grep "^ *:" Makefile.in && Exit 1
+grep '^ *:$' Makefile.in && Exit 1

 :
--
1.7.9.210.g21ac7a



reply via email to

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