automake-patches
[Top][All Lists]
Advanced

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

[PATCH 8/9] Tests on extensibility of silent-rules made stricter.


From: Stefano Lattarini
Subject: [PATCH 8/9] Tests on extensibility of silent-rules made stricter.
Date: Mon, 26 Apr 2010 00:15:33 +0200
User-agent: KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.4; i686; ; )

* tests/silent6.test: Made stricter w.r.t. the grepping of the
output produced by `make'.  Updated copyright years.
* tests/silent7.test: Likewise.
From 582b23876885e456ece989d26c5d947234f3023a Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sun, 25 Apr 2010 22:57:22 +0200
Subject: [PATCH 8/9] Tests on extensibility of silent-rules made stricter.

* tests/silent6.test: Made stricter w.r.t. the grepping of the
output produced by `make'.  Updated copyright years.
* tests/silent7.test: Likewise.
---
 ChangeLog          |    5 +++++
 tests/silent6.test |    6 ++----
 tests/silent7.test |   17 +++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b99e21..b72c9ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-25  Stefano Lattarini  <address@hidden>
 
+       Make tests on user extensibility of silent-rules mode stricter.
+       * tests/silent6.test: Made stricter w.r.t. the grepping of the
+       output produced by `make'.  Updated copyright years.
+       * tests/silent7.test: Likewise.
+
        Tests on silent-mode for C/Libtool made stricter.
        * tests/silent.test: Made stricter w.r.t. the grepping of the
        output produced by `make'.
diff --git a/tests/silent6.test b/tests/silent6.test
index e6f08dd..710c1a0 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -61,7 +61,7 @@ $MAKE distclean
 ./configure --disable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 
 $MAKE distclean
@@ -99,5 +99,3 @@ $AUTOMAKE
 grep 'AM_V_GEN' Makefile.in
 $AUTOMAKE --force -Wno-all -Wportability
 grep 'AM_V_GEN' Makefile.in
-
-:
diff --git a/tests/silent7.test b/tests/silent7.test
index e953605..fec8333 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -46,50 +46,47 @@ $AUTOCONF
 ./configure --disable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 $MAKE clean
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 $MAKE clean
 $MAKE V=0 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout
+grep 'GEN .*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
-
 $MAKE distclean
 
 ./configure --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout
+grep 'GEN .*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
 $MAKE clean
 $MAKE V=0 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout
+grep 'GEN .*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
 $MAKE clean
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 # Ensure that setting `silent-rules' in a Makefile.am produces an error.
 echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
 AUTOMAKE_fails --force
-
-:
-- 
1.6.5


reply via email to

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