[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-6-g1458f2f

[Ralf Wildenhues]

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=1458f2f8dfbff958ed74e297d50f8ce95708ff79

The branch, branch-1.11 has been updated
       via  1458f2f8dfbff958ed74e297d50f8ce95708ff79 (commit)
       via  2da14d759b317983dd3a623fd0b213788996fca6 (commit)
      from  917e1e8946e964c71370f89445c758c000457658 (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 1458f2f8dfbff958ed74e297d50f8ce95708ff79
Merge: 917e1e8946e964c71370f89445c758c000457658 
2da14d759b317983dd3a623fd0b213788996fca6
Author: Ralf Wildenhues <address@hidden>
Date:   Tue May 19 07:49:53 2009 +0200

    Merge branch 'maint' into branch-1.11

commit 2da14d759b317983dd3a623fd0b213788996fca6
Author: Ralf Wildenhues <address@hidden>
Date:   Tue May 19 07:49:27 2009 +0200

    Revert last patch, IRIX has an editor named `jot'.
    
    * tests/instmany-mans.test: Do not try `jot'.
    * tests/instmany-python.test: Likewise.
    * tests/instmany.test: Likewise.
    Report by Peter O'Gorman.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                  |    8 ++++++++
 tests/instmany-mans.test   |    4 ++--
 tests/instmany-python.test |    2 +-
 tests/instmany.test        |    4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7967f07..0bd3c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-19  Ralf Wildenhues  <address@hidden>
+
+       Revert last patch, IRIX has an editor named `jot'.
+       * tests/instmany-mans.test: Do not try `jot'.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       Report by Peter O'Gorman.
+
 2009-05-18  Ralf Wildenhues  <address@hidden>
 
        testsuite: also try `jot' as `seq' replacement.
diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test
index 5fafa67..fcee60b 100755
--- a/tests/instmany-mans.test
+++ b/tests/instmany-mans.test
@@ -31,8 +31,8 @@ limit=2500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 
-# Let's use `seq' or `jot' if available, they are faster than the loop.
-list=`(seq 1 $nfiles) 2>/dev/null || (jot $nfiles) 2>/dev/null || {
+# Let's use `seq' if available, it's faster than the loop.
+list=`(seq 1 $nfiles) 2>/dev/null || {
   i=1
   while test $i -le $nfiles; do
     echo $i
diff --git a/tests/instmany-python.test b/tests/instmany-python.test
index 9407948..6831c9e 100755
--- a/tests/instmany-python.test
+++ b/tests/instmany-python.test
@@ -27,7 +27,7 @@ limit=2500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 
-list=`(seq 1 $nfiles) 2>/dev/null || (jot $nfiles) 2>/dev/null || {
+list=`(seq 1 $nfiles) 2>/dev/null || {
   i=1
   while test $i -le $nfiles; do
     echo $i
diff --git a/tests/instmany.test b/tests/instmany.test
index e423710..a3b10cb 100755
--- a/tests/instmany.test
+++ b/tests/instmany.test
@@ -39,8 +39,8 @@ limit=2500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 
-# Let's use `seq' or `jot' if available, they are faster than the loop.
-list=`(seq 1 $nfiles) 2>/dev/null || (jot $nfiles) 2>/dev/null || {
+# Let's use `seq' if available, it's faster than the loop.
+list=`(seq 1 $nfiles) 2>/dev/null || {
   i=1
   while test $i -le $nfiles; do
     echo $i


hooks/post-receive
-- 
GNU Automake