From f923b46e12d2c8553e00bf311e5544711f85b7d7 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 4 Mar 2010 21:09:13 +0100 Subject: [PATCH] Remove redundant unset of variable TESTS from some test scripts. * tests/color.test: Do not unset the `TESTS' variable, as it's already unset in the `defs' file. * tests/check5.test: Likewise. * tests/check8.test: Likewise. * tests/check9.test: Likewise. * tests/check10.test: Likewise. * tests/check11.test: Likewise. * tests/parallel-tests.test: Likewise. * tests/parallel-tests3.test: Likewise. * tests/parallel-tests4.test: Likewise. * tests/parallel-tests5.test: Likewise. * tests/parallel-tests6.test: Likewise. * tests/parallel-tests7.test: Likewise. --- ChangeLog | 17 +++++++++++++++++ tests/check10.test | 4 +--- tests/check11.test | 4 +--- tests/check5.test | 4 ++-- tests/check8.test | 4 +--- tests/check9.test | 4 +--- tests/color.test | 4 +--- tests/parallel-tests.test | 4 +--- tests/parallel-tests3.test | 4 +--- tests/parallel-tests4.test | 4 +--- tests/parallel-tests5.test | 4 +--- tests/parallel-tests6.test | 4 +--- tests/parallel-tests7.test | 4 +--- 13 files changed, 30 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index fad03cd85..84faddcf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2010-03-04 Stefano Lattarini + + Remove redundant unset of variable TESTS from some test scripts. + * tests/color.test: Do not unset the `TESTS' variable, as it's + already unset in the `defs' file. + * tests/check5.test: Likewise. + * tests/check8.test: Likewise. + * tests/check9.test: Likewise. + * tests/check10.test: Likewise. + * tests/check11.test: Likewise. + * tests/parallel-tests.test: Likewise. + * tests/parallel-tests3.test: Likewise. + * tests/parallel-tests4.test: Likewise. + * tests/parallel-tests5.test: Likewise. + * tests/parallel-tests6.test: Likewise. + * tests/parallel-tests7.test: Likewise. + 2010-02-22 Karl Berry Improve help message of mdate-sh. diff --git a/tests/check10.test b/tests/check10.test index 76af45280..ab9b5298c 100755 --- a/tests/check10.test +++ b/tests/check10.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008, 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 @@ -54,8 +54,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -unset TESTS || : - ./configure ( # Do not check for failure in this subshell diff --git a/tests/check11.test b/tests/check11.test index d3118a766..1fe6a4d3a 100755 --- a/tests/check11.test +++ b/tests/check11.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 @@ -39,8 +39,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure env TESTS=skip $MAKE -e check >stdout cat stdout diff --git a/tests/check5.test b/tests/check5.test index 857432b97..7113e1b3e 100755 --- a/tests/check5.test +++ b/tests/check5.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2008, 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,7 +47,6 @@ END cp one.c two.c ./configure -unset TESTS || : $MAKE check test -f ok EXEEXT=.bin $MAKE -e print-tests >output diff --git a/tests/check8.test b/tests/check8.test index 793658295..dc8d3dda7 100755 --- a/tests/check8.test +++ b/tests/check8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008, 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 @@ -64,8 +64,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure AM_COLOR_TESTS=always $MAKE -e check >stdout 2>stderr && { cat stdout; cat stderr >&2; Exit 1; } diff --git a/tests/check9.test b/tests/check9.test index ed886901c..c80d780b4 100755 --- a/tests/check9.test +++ b/tests/check9.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008, 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 @@ -64,8 +64,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure $MAKE all $MAKE check diff --git a/tests/color.test b/tests/color.test index a5bd063f7..6fa686d7f 100755 --- a/tests/color.test +++ b/tests/color.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, 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 @@ -99,8 +99,6 @@ spawn $env(MAKE) -e check expect eof END -unset TESTS || : - AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; } cat stdout test_color diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test index 385cef329..97e27b150 100755 --- a/tests/parallel-tests.test +++ b/tests/parallel-tests.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,8 +61,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure # No hard errors: all tests should be run, there should be one failure. env DISABLE_HARD_ERRORS=yes $MAKE -e check >stdout && { cat stdout; Exit 1; } diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test index d631d6726..e1cbe9f44 100755 --- a/tests/parallel-tests3.test +++ b/tests/parallel-tests3.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 @@ -52,8 +52,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - for build in serial parallel; do mkdir $build cd $build diff --git a/tests/parallel-tests4.test b/tests/parallel-tests4.test index d842486cb..f48da5ef9 100755 --- a/tests/parallel-tests4.test +++ b/tests/parallel-tests4.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 @@ -56,8 +56,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure $MAKE $MAKE check diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test index a7bbc9e16..6db5db6e2 100755 --- a/tests/parallel-tests5.test +++ b/tests/parallel-tests5.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 @@ -60,8 +60,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure $MAKE -j4 check $MAKE distcheck diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test index 5dbb43355..7ed7ad6da 100755 --- a/tests/parallel-tests6.test +++ b/tests/parallel-tests6.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 @@ -34,8 +34,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure $MAKE check >stdout || { cat stdout; Exit 1; } cat stdout diff --git a/tests/parallel-tests7.test b/tests/parallel-tests7.test index c2ae63a16..2432c880a 100755 --- a/tests/parallel-tests7.test +++ b/tests/parallel-tests7.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 @@ -77,8 +77,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -unset TESTS || : - ./configure $MAKE $MAKE check -- 2.47.2