* tests/atgeneral.m4: Don't redirect builtins' stderr as Ultrix

hates this: use a subshell.

diff --git a/ChangeLog b/ChangeLog
index ddf413e133406833185515a4061eb2561a97d761..cdf4462deb1beffa788b9ea3d11921ba6b3e3dff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-29  Akim Demaille  <akim@epita.fr>
+
+       * tests/atgeneral.m4: Don't redirect builtins' stderr as Ultrix
+       hates this: use a subshell.
+
 2001-01-29  Assar Westerlund  <assar@sics.se>
 
        * m4sh.m4 (_AS_TEST_PREPARE): Discard output when testing `test

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 0f1337089082204f8bd5bc5360374d9b7a24bd9c..b13b930b06891f43c3cf244ab9123cf8140d59c4 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1,6 +1,6 @@
 include(m4sh.m4)                                           -*- Autoconf -*-
 # M4 macros used in building test suites.
-# Copyright 2000 Free Software Foundation, Inc.
+# Copyright 2000, 2001 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
@@ -109,8 +109,9 @@ at_path=`pwd`
 at_IFS_save=$IFS
 IFS=:
 for at_dir in $AUTOTEST_PATH $PATH; do
-  # There might be directories that don't exist.
-  at_dir=`cd "$at_dir" 2>/dev/null && pwd`
+  # There might be directories that don't exist, but don't redirect
+  # builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+  at_dir=`(cd "$at_dir" && pwd) 2>/dev/null`
   test -n "$at_dir" && at_path=$at_path:$at_dir
 done
 IFS=$at_IFS_save

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 0f1337089082204f8bd5bc5360374d9b7a24bd9c..b13b930b06891f43c3cf244ab9123cf8140d59c4 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -1,6 +1,6 @@
 include(m4sh.m4)                                           -*- Autoconf -*-
 # M4 macros used in building test suites.
-# Copyright 2000 Free Software Foundation, Inc.
+# Copyright 2000, 2001 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
@@ -109,8 +109,9 @@ at_path=`pwd`
 at_IFS_save=$IFS
 IFS=:
 for at_dir in $AUTOTEST_PATH $PATH; do
-  # There might be directories that don't exist.
-  at_dir=`cd "$at_dir" 2>/dev/null && pwd`
+  # There might be directories that don't exist, but don't redirect
+  # builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+  at_dir=`(cd "$at_dir" && pwd) 2>/dev/null`
   test -n "$at_dir" && at_path=$at_path:$at_dir
 done
 IFS=$at_IFS_save