[glib: 1/16] build: Drop MALLOC_PERTURB_ from test environments




commit 1b377e6574edc8a35256c96347d735239e52b016
Author: Philip Withnall <pwithnall endlessos org>
Date:   Tue Jun 21 12:49:15 2022 +0100

    build: Drop MALLOC_PERTURB_ from test environments
    
    It’s set already by Meson, to an actually random value.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 glib/tests/meson.build    | 4 ----
 gmodule/tests/meson.build | 1 -
 gobject/tests/meson.build | 4 ----
 tests/meson.build         | 4 ----
 4 files changed, 13 deletions(-)
---
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index df0d9f8dd1..d16a071e56 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -231,15 +231,11 @@ if installed_tests_enabled
   install_subdir('time-zones', install_dir : installed_tests_execdir)
 endif
 
-# Not entirely random of course, but at least it changes over time
-random_number = minor_version + meson.version().split('.').get(1).to_int()
-
 test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 test_env.set('G_DEBUG', 'gc-friendly')
 test_env.set('MALLOC_CHECK_', '2')
-test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 
 test_deps = [libm, thread_dep, libglib_dep]
 test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build
index 1650fe5e06..ad1893b900 100644
--- a/gmodule/tests/meson.build
+++ b/gmodule/tests/meson.build
@@ -41,7 +41,6 @@ test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 test_env.set('G_DEBUG', 'gc-friendly')
 test_env.set('MALLOC_CHECK_', '2')
-test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 
 test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep]
 test_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT']
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 84132518ab..c5e28b0a00 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -109,15 +109,11 @@ python_tests = [
 ]
 
 # FIXME: put common bits of test environment() in one location
-# Not entirely random of course, but at least it changes over time
-random_number = minor_version + meson.version().split('.').get(1).to_int()
-
 test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 test_env.set('G_DEBUG', 'gc-friendly')
 test_env.set('MALLOC_CHECK_', '2')
-test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 
 test_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
 test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT']
diff --git a/tests/meson.build b/tests/meson.build
index 9fd1ab1218..c2d927854a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,14 +1,10 @@
 # tests
 
-# Not entirely random of course, but at least it changes over time
-random_number = minor_version + meson.version().split('.').get(1).to_int()
-
 test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 test_env.set('G_DEBUG', 'gc-friendly')
 test_env.set('MALLOC_CHECK_', '2')
-test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 
 test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]