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.

diff --git a/ChangeLog b/ChangeLog
index 3f2b780e4895215dc991ce70b51f64dfb63c7289..076280c97ff996b938004ca09c514da42d51f000 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       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 a1dea94b9d2af1cc8ed1f9dc1bdcd0722d3d1817..3c713e9285777ccb6be2a83e3d15a5520656f40b 100755 (executable)
--- 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 7f2027ff0bbf9d7bfa5a5171a944b13dc457f913..5b51287a6f6217a15f70ba1ac13470ac031fe86e 100755 (executable)
--- 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