* tests/atconfig.in: Move code into...

* tests/atgeneral.m4 (AT_INIT): here.
Use AS_SHELL_SANITIZE.

diff --git a/ChangeLog b/ChangeLog
index c7f7b9bc9dedc0607c4e09843364b268e03b56b6..2dbb2e0dace3c1f33de52d3ec7158c2284e39a14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-23  Akim Demaille  <akim@epita.fr>
+
+       * tests/atconfig.in: Move code into...
+       * tests/atgeneral.m4 (AT_INIT): here.
+       Use AS_SHELL_SANITIZE.
+
 2000-11-23  Akim Demaille  <akim@epita.fr>
 
        Have the test suite list of the test groups and their references.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index bc032bacdfc82a60bfeccd9d8ad8640d7288af40..775042032e5670e554f51c5b8b4b03bee6adfb32 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -102,7 +102,22 @@ AT_DEFINE([AT_INIT],
 [AT_DEFINE([AT_ordinal], 0)
 m4_divert_push([DEFAULT])dnl
 #! /bin/sh
+
+AS_SHELL_SANITIZE
+
 . ./atconfig
+# Use absolute file notations, as the test might change directories.
+at_srcdir=`cd "$srcdir" && pwd`
+at_top_srcdir=`cd "$top_srcdir" && pwd`
+
+if test -n "$AUTOTEST_PATH"; then
+  export PATH; PATH=`pwd`:`cd "$AUTOTEST_PATH" && pwd`:$PATH
+else
+  export PATH; PATH=`pwd`:$PATH
+fi
+
+test -f atlocal && . ./atlocal
+
 # -e sets to true
 at_stop_on_error=false;
 # Shall we save and check stdout and stderr?

diff --git a/tests/atconfig.in b/tests/atconfig.in
index 54e1e6d4cb11c67f959b310c053ecc1f27116ee4..5b239206450e690218e179ceaf8ccc3f822fce3f 100644 (file)
--- a/tests/atconfig.in
+++ b/tests/atconfig.in
@@ -1,6 +1,6 @@
 # @configure_input@                                    -*- shell-script -*-
 # Configurable variable values for building test suites.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright 2000 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,27 +52,10 @@ at_package=@PACKAGE@
 at_version=@VERSION@
 at_n=@ECHO_N@
 at_c='@ECHO_C@'
-test -f atlocal && . ./atlocal
-
-# LC_MESSAGES is always shadowed by LC_ALL.  Here are the only cases:
-# - GNU:       LANGUAGE -> LC_ALL -> LC_MESSAGES -> LANG
-# - POSIX:     LC_ALL -> LC_MESSAGES -> LANG
-# - XPG4:      LC_ALL -> LANG
-# - SysV/XPG2: LANG
-export LANGUAGE; LANGUAGE=C
-export LANG; LANG=C
-export LC_ALL; LC_ALL=C
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
-# Use absolute file notations, as the test might change directories.
-at_srcdir=`cd @srcdir@ && pwd`
-at_top_srcdir=`cd @top_srcdir@ && pwd`
-if test -n "@AUTOTEST_PATH@"; then
-  export PATH; PATH=`pwd`:`cd @AUTOTEST_PATH@ && pwd`:$PATH
-else
-  export PATH; PATH=`pwd`:$PATH
-fi
+AUTOTEST_PATH=@AUTOTEST_PATH@
 
 # We need GNU m4.
 M4=@M4@

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index bc032bacdfc82a60bfeccd9d8ad8640d7288af40..775042032e5670e554f51c5b8b4b03bee6adfb32 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -102,7 +102,22 @@ AT_DEFINE([AT_INIT],
 [AT_DEFINE([AT_ordinal], 0)
 m4_divert_push([DEFAULT])dnl
 #! /bin/sh
+
+AS_SHELL_SANITIZE
+
 . ./atconfig
+# Use absolute file notations, as the test might change directories.
+at_srcdir=`cd "$srcdir" && pwd`
+at_top_srcdir=`cd "$top_srcdir" && pwd`
+
+if test -n "$AUTOTEST_PATH"; then
+  export PATH; PATH=`pwd`:`cd "$AUTOTEST_PATH" && pwd`:$PATH
+else
+  export PATH; PATH=`pwd`:$PATH
+fi
+
+test -f atlocal && . ./atlocal
+
 # -e sets to true
 at_stop_on_error=false;
 # Shall we save and check stdout and stderr?