From 23aa3dbbf5d5a28a33604599eb4f848f293e9933 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 18 May 2009 20:57:05 +0200 Subject: [PATCH] testsuite: also try `jot' as `seq' replacement. * tests/instmany-mans.test: Try BSD `jot' before resorting to a slow but portable shell loop. * tests/instmany-python.test: Likewise. * tests/instmany.test: Likewise. Suggestion by Peter O'Gorman. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ tests/instmany-mans.test | 6 +++--- tests/instmany-python.test | 4 ++-- tests/instmany.test | 6 +++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c86d40c3d..0aaeaadf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-05-18 Ralf Wildenhues + testsuite: also try `jot' as `seq' replacement. + * tests/instmany-mans.test: Try BSD `jot' before resorting to a + slow but portable shell loop. + * tests/instmany-python.test: Likewise. + * tests/instmany.test: Likewise. + Suggestion by Peter O'Gorman. + Fix test failure when pkg.m4 is not found, only pkg-config. * tests/vala5.test: Update comment, this test is not expected to fail any more. Require valac version 0.7.0. Skip if configure diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test index 3ba8334ee..5fafa671d 100755 --- a/tests/instmany-mans.test +++ b/tests/instmany-mans.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 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 @@ -31,8 +31,8 @@ limit=2500 subdir=long_subdir_name_with_many_characters nfiles=81 -# Let's use `seq' if available, it's faster than the loop. -list=`(seq 1 $nfiles) 2>/dev/null || { +# 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 || { i=1 while test $i -le $nfiles; do echo $i diff --git a/tests/instmany-python.test b/tests/instmany-python.test index d55af0f89..940794811 100755 --- a/tests/instmany-python.test +++ b/tests/instmany-python.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 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 @@ -27,7 +27,7 @@ limit=2500 subdir=long_subdir_name_with_many_characters nfiles=81 -list=`(seq 1 $nfiles) 2>/dev/null || { +list=`(seq 1 $nfiles) 2>/dev/null || (jot $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 aabeb7b63..e423710b0 100755 --- a/tests/instmany.test +++ b/tests/instmany.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 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 @@ -39,8 +39,8 @@ limit=2500 subdir=long_subdir_name_with_many_characters nfiles=81 -# Let's use `seq' if available, it's faster than the loop. -list=`(seq 1 $nfiles) 2>/dev/null || { +# 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 || { i=1 while test $i -le $nfiles; do echo $i -- 2.11.4.GIT