From: Arjun Shankar <arjun@redhat.com>
Date: Thu, 24 Sep 2020 12:58:36 +0000 (+0200)
Subject: Set locale related environment variables in debugglibc.sh
X-Git-Tag: glibc-2.33~470
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3b0b6916a2d4a966bbd852964054d475836c9eb;p=thirdparty%2Fglibc.git

Set locale related environment variables in debugglibc.sh

Tests and binaries that use locale related functions need to run in the
correct locale environment when being debugged via debugglibc.sh.  This
commit sets up the environment, specifically: GCONV_PATH, LOCPATH, and
LC_ALL for such tests and binaries when they are being debugged outside
of a test container.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/Makefile b/Makefile
index 6dcfe40c25e..0fb5ffa1280 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,15 @@ then
   exit 1
 fi
 
+# Container tests needing locale data should install them in-container.
+# Other tests/binaries need to use locale data from the build tree.
+if [ "$$CONTAINER" = false ]
+then
+  ENVVARS="GCONV_PATH=$${BUILD_DIR}/iconvdata $$ENVVARS"
+  ENVVARS="LOCPATH=$${BUILD_DIR}/localedata $$ENVVARS"
+  ENVVARS="LC_ALL=C $$ENVVARS"
+fi
+
 # Expand environment setup command
 if [ -v ENVVARS ]
 then