From b344de2a1c69a82e8ab6d22c31d487233c389f6d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 6 Apr 2002 05:11:18 +0000
Subject: [PATCH] Update.

	* intl/tst-gettext.sh: Set GCONV_PATH and LOCPATH to values for the
	test just before the test runs.
	* intl/tst-translit.sh: Likewise.
	* intl/tst-codeset.sh: Likewise.
---
 ChangeLog            |  5 +++++
 intl/tst-codeset.sh  | 11 ++++++-----
 intl/tst-gettext.sh  | 11 ++++++-----
 intl/tst-translit.sh | 10 +++++-----
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40293b5566..dccf0de279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-04-05  Ulrich Drepper  <drepper@redhat.com>
 
+	* intl/tst-gettext.sh: Set GCONV_PATH and LOCPATH to values for the
+	test just before the test runs.
+	* intl/tst-translit.sh: Likewise.
+	* intl/tst-codeset.sh: Likewise.
+
 	* timezone/zic.c: Update from tzcode2002c.
 	* timezone/asia: Update from tzdata2002c.
 	* timezone/backward: Likewise.
diff --git a/intl/tst-codeset.sh b/intl/tst-codeset.sh
index 85efbffe64..3d9b9559b7 100644
--- a/intl/tst-codeset.sh
+++ b/intl/tst-codeset.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test of bind_textdomain_codeset.
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -22,10 +22,6 @@
 common_objpfx=$1
 objpfx=$2
 
-GCONV_PATH=${common_objpfx}iconvdata
-export GCONV_PATH
-LOCPATH=${common_objpfx}localedata
-export LOCPATH
 LC_ALL=C
 export LC_ALL
 
@@ -37,6 +33,11 @@ test -d ${objpfx}domaindir/de_DE/LC_MESSAGES || mkdir ${objpfx}domaindir/de_DE/L
 # Populate them.
 msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo tstcodeset.po
 
+GCONV_PATH=${common_objpfx}iconvdata
+export GCONV_PATH
+LOCPATH=${common_objpfx}localedata
+export LOCPATH
+
 ${common_objpfx}elf/ld.so --library-path $common_objpfx \
 ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
 
diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index 31281b2717..3c7ccc392e 100755
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test of gettext functions.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -23,10 +23,6 @@ common_objpfx=$1
 objpfx=$2
 malloc_trace=$3
 
-GCONV_PATH=${common_objpfx}iconvdata
-export GCONV_PATH
-LOCPATH=${common_objpfx}localedata
-export LOCPATH
 LC_ALL=C
 export LC_ALL
 
@@ -57,6 +53,11 @@ msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_TIME/existing-time-domain.mo \
        ../po/de.po
 
+GCONV_PATH=${common_objpfx}iconvdata
+export GCONV_PATH
+LOCPATH=${common_objpfx}localedata
+export LOCPATH
+
 # Now run the test.
 MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
 ${common_objpfx}elf/ld.so --library-path $common_objpfx \
diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh
index 1a4a783a5a..e2508df4df 100755
--- a/intl/tst-translit.sh
+++ b/intl/tst-translit.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test of transliteration in gettext functions.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -22,16 +22,16 @@
 common_objpfx=$1
 objpfx=$2
 
-GCONV_PATH=${common_objpfx}iconvdata
-export GCONV_PATH
-LOCPATH=${common_objpfx}localedata
-export LOCPATH
 LC_ALL=C
 export LC_ALL
 
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/translit.mo \
        translit.po
 
+GCONV_PATH=${common_objpfx}iconvdata
+export GCONV_PATH
+LOCPATH=${common_objpfx}localedata
+export LOCPATH
 
 ${common_objpfx}elf/ld.so --library-path $common_objpfx \
 ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir