From 23ba9072e1e3cd15c7e6fc5f2518680f2018a7b0 Mon Sep 17 00:00:00 2001
From: O S K Chaitanya <osk@medhas.org>
Date: Tue, 23 Sep 2014 02:20:19 +0200
Subject: [PATCH 1/2] Use locale 'C' for running tests. Closes #17423

---
 mk/tests.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mk/tests.mk b/mk/tests.mk
index d28b80a597886..12bc919262754 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -60,6 +60,10 @@ ifdef VERBOSE
   CTEST_TESTARGS += --verbose
 endif
 
+# Setting locale ensures that gdb's output remains consistent.
+# This prevents tests from failing with some locales (fixes #17423).
+export LC_ALL=C
+
 # If we're running perf then set this environment variable
 # to put the benchmarks into 'hard mode'
 ifeq ($(MAKECMDGOALS),perf)

From 2443dd0dccd69a60f0086faed93d316965a95fe3 Mon Sep 17 00:00:00 2001
From: O S K Chaitanya <osk@medhas.org>
Date: Tue, 23 Sep 2014 03:12:37 +0200
Subject: [PATCH 2/2] collapse setting and exporting RUST_BENCH into one line

---
 mk/tests.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mk/tests.mk b/mk/tests.mk
index 12bc919262754..a872395855b36 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -67,8 +67,7 @@ export LC_ALL=C
 # If we're running perf then set this environment variable
 # to put the benchmarks into 'hard mode'
 ifeq ($(MAKECMDGOALS),perf)
-  RUST_BENCH=1
-  export RUST_BENCH
+  export RUST_BENCH=1
 endif
 
 TEST_LOG_FILE=tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log