[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.1-142-gda9ad6f

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=da9ad6fafeaf5dfa710a1a2b4176d1a049fddf13

The branch, master has been updated
       via  da9ad6fafeaf5dfa710a1a2b4176d1a049fddf13 (commit)
       via  70b71392807b18e57217e9ed7975965866ae88bc (commit)
      from  27478539b094a2b0bee4f8a452bec552edcabdbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da9ad6fafeaf5dfa710a1a2b4176d1a049fddf13
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 28 11:20:43 2012 +0200

    cosmetics: remove trailing whitespace in some files
    
    * lib/missing, t/comment7.sh, t/objc-flags.sh, t/objcxx-flags.sh,
    t/perf/testsuite-summary.sh, t/self-check-explicit-skips.sh: Here.
    
    Prompted by a report from Karl Berry.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 70b71392807b18e57217e9ed7975965866ae88bc
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 28 11:09:05 2012 +0200

    coverage: enhance tests in 'missing' script a little
    
    * t/am-missing-prog.sh: Here, by also verifying its expected
    exit status.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 lib/missing                    |    2 +-
 t/am-missing-prog.sh           |    4 +---
 t/comment7.sh                  |    2 +-
 t/objc-flags.sh                |    2 +-
 t/objcxx-flags.sh              |    2 +-
 t/perf/testsuite-summary.sh    |    2 +-
 t/self-check-explicit-skips.sh |    2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/missing b/lib/missing
index dab67a8..ed429b4 100755
--- a/lib/missing
+++ b/lib/missing
@@ -135,7 +135,7 @@ give_advice ()
     s/^g//; t'`
 
   printf '%s\n' "'$1' is $msg."
- 
+
   configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
   case $normalized_program in
     autoconf*)
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
index a3e0cac..00d8e37 100755
--- a/t/am-missing-prog.sh
+++ b/t/am-missing-prog.sh
@@ -51,13 +51,11 @@ o = address@hidden
 e = address@hidden
 
 debug_info = grep . address@hidden address@hidden
-status_is = $(debug_info); echo $@: st=$$st; : test $$st -eq
+status_is = $(debug_info); echo $@: st=$$st; test $$st -eq
 
 w_mis = 'am-none-none' is needed, and is missing on your system
 w_old = 'am-exit-63' is needed, and is probably too old
 
-# FIXME: make this test stricter w.r.t. the exit statuses once
-# FIXME: we are merged to master!
 test1:
        st=0; $(NO_SUCH_COMMAND) >$o 2>$e || st=$$?; $(status_is) 127
         grep "^WARNING: $(w_mis)" $e
diff --git a/t/comment7.sh b/t/comment7.sh
index 634cc20..186daa0 100755
--- a/t/comment7.sh
+++ b/t/comment7.sh
@@ -54,4 +54,4 @@ sed -n '/^#.*VAR.*COND_FALSE/ {
         }' Makefile.in |
   grep '@address@hidden = bar'
 
-: 
+:
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index 6c2b1e6..25f805b 100755
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
@@ -57,6 +57,6 @@ grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)'    Makefile.in && 
Exit 1
 grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1
 
 ./configure OBJCFLAGS=-UERROR
-$MAKE 
+$MAKE
 
 :
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index a948891..082f7fb 100755
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
@@ -58,6 +58,6 @@ grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)'    Makefile.in 
&& Exit 1
 grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1
 
 ./configure OBJCXXFLAGS=-UERROR
-$MAKE 
+$MAKE
 
 :
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index cefef17..04408ee 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -45,7 +45,7 @@ for i in $(seq_ 1 $count); do
   echo :test-result: PASS >> $i.trs
   echo :copy-in-global-log: yes >> $i.trs
   echo TESTS += $i.t
-done >> Makefile.am 
+done >> Makefile.am
 
 # Re-enable shell traces.
 set -x
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
index ffab44d..a167941 100755
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
@@ -40,7 +40,7 @@ test $? -eq 77 || Exit 1
 run_dummy_test 'sh -c "exit 77"' am_explicit_skips=no
 test $? -eq 77 || Exit 1
 
-run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes 
+run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes
 test $? -eq 78 || Exit 1
 
 run_dummy_test 'sh -c "exit 77"' am_explicit_skips=y


hooks/post-receive
-- 
GNU Automake