aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-07-03 20:31:20 +0200
committerSverker Eriksson <[email protected]>2018-07-10 14:11:56 +0200
commitedabb78bccd26fe817844d92cd04d8ac7fb8e817 (patch)
tree65b051d287c383c8e28afe21b2f42caa96385a43 /erts
parent7603a4fb82f72a72045eed26dd55de3067cfe344 (diff)
downloadotp-edabb78bccd26fe817844d92cd04d8ac7fb8e817.tar.gz
otp-edabb78bccd26fe817844d92cd04d8ac7fb8e817.tar.bz2
otp-edabb78bccd26fe817844d92cd04d8ac7fb8e817.zip
erts: Fix benign bug in cerl for valgrind
benign until valgrind version 4.* shows up.
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/unix/cerl.src5
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 896e4c8e45..2e034513b0 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -264,13 +264,14 @@ if [ "x$GDB" = "x" ]; then
valversion=`valgrind --version`
valmajor=`echo $valversion | sed 's,[a-z]*\-\([0-9]*\).*,\1,'`
valminor=`echo $valversion | sed 's,[a-z]*\-[0-9]*.\([0-9]*\).*,\1,'`
+ valint=`echo "$valmajor * 1000 + $valminor" | bc`
if [ "x$VALGRIND_LOG_XML" = "x" ]; then
valgrind_xml=
log_file_prefix="--log-file="
else
export VALGRIND_LOG_XML
valgrind_xml="--xml=yes"
- if [ $valmajor -gt 2 -a $valminor -gt 4 ]; then
+ if [ $valint -gt 3004 ]; then
log_file_prefix="--xml-file="
else
log_file_prefix="--log-file="
@@ -279,7 +280,7 @@ if [ "x$GDB" = "x" ]; then
if [ "x$VALGRIND_LOG_DIR" = "x" ]; then
valgrind_log=
else
- if [ $valmajor -gt 2 -a $valminor -gt 4 ]; then
+ if [ $valint -gt 3004 ]; then
valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU_NAME.log.$$"
else
valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU_NAME.log"