From 74dc99925da8850d2ebb6e85fc00597b348685b1 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 13 Jan 2008 18:05:04 +0100 Subject: [PATCH] Fix Heisenbug trying to unset a sometimes-not-set variable. * tests/check5.test: Do not error out upon `unset TESTS' due to `set -e', in case TESTS was not set. * tests/color.test: Likewise. --- ChangeLog | 5 +++++ tests/check5.test | 4 ++-- tests/color.test | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f2b780e4..076280c97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-01-13 Ralf Wildenhues + Fix Heisenbug trying to unset a sometimes-not-set variable. + * tests/check5.test: Do not error out upon `unset TESTS' due to + `set -e', in case TESTS was not set. + * tests/color.test: Likewise. + * doc/automake.texi (amhello Explained): Fix odd sentence. Report by nightstrike@gmail.com. diff --git a/tests/check5.test b/tests/check5.test index a1dea94b9..3c713e928 100755 --- a/tests/check5.test +++ b/tests/check5.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2008 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 +46,7 @@ END cp one.c two.c ./configure -unset TESTS +unset TESTS || : $MAKE check test -f ok EXEEXT=.bin $MAKE -e print-tests >output diff --git a/tests/color.test b/tests/color.test index 7f2027ff0..5b51287a6 100755 --- a/tests/color.test +++ b/tests/color.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008 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 @@ -89,7 +89,7 @@ spawn $env(MAKE) -e check expect eof END -unset TESTS +unset TESTS || : AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; exit 1; } cat stdout -- 2.11.4.GIT