From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 5 Dec 2005 16:35:38 +0000 (+0000)
Subject: Set MALLOC_CHECK_ and MALLOC_PERTURB_
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=81f0bb11a95f1ddc8c5238ff4e6a8ee428fdf19c;p=dana%2Fcg-glib.git

Set MALLOC_CHECK_ and MALLOC_PERTURB_

2005-12-05  Matthias Clasen  <mclasen@redhat.com>

	* tests/Makefile.am (TESTS_ENVIRONMENT):
	* tests/gobject/Makefile.am (TESTS_ENVIRONMENT): Set
	MALLOC_CHECK_ and MALLOC_PERTURB_

	* tests/run-collate-tests.sh: Run the collation tests explicitly
	in en_US locale. (#320463)
---

diff --git a/ChangeLog b/ChangeLog
index c0255c12..94be6279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/Makefile.am (TESTS_ENVIRONMENT): 
+	* tests/gobject/Makefile.am (TESTS_ENVIRONMENT): Set
+	MALLOC_CHECK_ and MALLOC_PERTURB_
+
+	* tests/run-collate-tests.sh: Run the collation tests explicitly 
+	in en_US locale. (#320463)
+
 	* glib/gmem.h: Really deprecate GMemChunk.
 
 	* glib/gdate.c: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c0255c12..94be6279 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/Makefile.am (TESTS_ENVIRONMENT): 
+	* tests/gobject/Makefile.am (TESTS_ENVIRONMENT): Set
+	MALLOC_CHECK_ and MALLOC_PERTURB_
+
+	* tests/run-collate-tests.sh: Run the collation tests explicitly 
+	in en_US locale. (#320463)
+
 	* glib/gmem.h: Really deprecate GMemChunk.
 
 	* glib/gdate.c: 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c0255c12..94be6279 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,12 @@
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/Makefile.am (TESTS_ENVIRONMENT): 
+	* tests/gobject/Makefile.am (TESTS_ENVIRONMENT): Set
+	MALLOC_CHECK_ and MALLOC_PERTURB_
+
+	* tests/run-collate-tests.sh: Run the collation tests explicitly 
+	in en_US locale. (#320463)
+
 	* glib/gmem.h: Really deprecate GMemChunk.
 
 	* glib/gdate.c: 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00726d63..763a61ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -116,7 +116,8 @@ check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 TESTS = $(test_programs) $(test_scripts)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
-	MALLOC_CHECK_=2
+	MALLOC_CHECK_=2	\
+	MALLOC_PERTURB_=$$(($$RANDOM % 256))
 
 progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)
 thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
diff --git a/tests/run-collate-tests.sh b/tests/run-collate-tests.sh
index 7f578286..89aed31d 100755
--- a/tests/run-collate-tests.sh
+++ b/tests/run-collate-tests.sh
@@ -13,6 +13,7 @@ echo_v ()
   fi
 }
 
+LANG=en_US
 error_out=/dev/null
 if [ "$1" = "-v" ]; then
   verbose=1