From: Eric Blake <ebb9@byu.net>
Date: Wed, 10 Sep 2008 20:06:33 +0000 (-0600)
Subject: Avoid testsuite bug in presence of verbose config.site.
X-Git-Tag: v2.63b~297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a9b1670c199a2fcd616cb1959771bc77251781b;p=thirdparty%2Fautoconf.git

Avoid testsuite bug in presence of verbose config.site.

* tests/base.at (Input/Output): Nullify config.site during test.
Reported by Bob Friesenhahn.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 4d534930..fa0aa49d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-10  Eric Blake  <ebb9@byu.net>
+
+	Avoid testsuite bug in presence of verbose config.site.
+	* tests/base.at (Input/Output): Nullify config.site during test.
+	Reported by Bob Friesenhahn.
+
 2008-09-09  Eric Blake  <ebb9@byu.net>
 
 	Release Version 2.63.
diff --git a/tests/base.at b/tests/base.at
index d85a1b5d..883db251 100644
--- a/tests/base.at
+++ b/tests/base.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([Autoconf base layer.])
 
-# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007 Free Software
+# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008 Free Software
 # Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -294,15 +294,14 @@ AT_CLEANUP
 
 AT_SETUP([Input/Output])
 
-m4_pattern_allow([^AS_(MESSAGE|ORIGINAL_STDIN)_FD$])
 AT_DATA([configure.ac],
 [[AC_INIT
-cat <&AS_ORIGINAL_STDIN_FD >&AS_MESSAGE_FD
+cat <&AS@&t@_ORIGINAL_STDIN_FD >&AS@&t@_MESSAGE_FD
 ]])
 AT_CHECK_AUTOCONF
-AT_CHECK([echo Hello | ./configure | grep -v 'configure: loading site script '],, [Hello
+AT_CHECK([echo Hello | CONFIG_SITE=/dev/null ./configure | grep -v 'configure: loading site script '],, [Hello
 ])
-AT_CHECK([echo Hello | ./configure --silent])
+AT_CHECK([echo Hello | CONFIG_SITE=/dev/null ./configure --silent])
 
 AT_CLEANUP