From cc6ea8f7c7642ec76dd1615e23cf57fd3d2a1aa9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 26 Oct 2017 18:43:55 +0100 Subject: [PATCH] Testsuite: support platform variance in debug output Solaris printf %p gives hex without a leading 0x --- test/runtest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtest b/test/runtest index 8f8767af4..94ecd6944 100755 --- a/test/runtest +++ b/test/runtest @@ -1116,8 +1116,8 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/; # Specific pointer values reported for DB operations change from run to run - s/^(returned from EXIM_DBOPEN: 0x)[0-9a-f]+/$1AAAAAAAA/; - s/^(EXIM_DBCLOSE.0x)[0-9a-f]+/$1AAAAAAAA/; + s/^(returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; + s/^(EXIM_DBCLOSE.)(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order -- 2.25.1