about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--scripts/test_printers_common.py3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index df941db962..5cc4dc9f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-19  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
+	* scripts/test_printers_common.py (init_test): Disable lock elision.
+
+2018-04-19  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
 	* math/test-tgmath.c (count_double, count_float,
 	count_ldouble, count_cdouble, count_cfloat,
 	count_cldouble): Use volatile int.
diff --git a/scripts/test_printers_common.py b/scripts/test_printers_common.py
index 73ca525556..cf4de5ae23 100644
--- a/scripts/test_printers_common.py
+++ b/scripts/test_printers_common.py
@@ -171,6 +171,9 @@ def init_test(test_bin, printer_files, printer_names):
     # Finally, load the test binary.
     test('file {0}'.format(test_bin))
 
+    # Disable lock elision.
+    test('set environment GLIBC_TUNABLES glibc.elision.enable=0')
+
 def go_to_main():
     """Executes a gdb 'start' command, which takes us to main."""