Testsuite: support platform variance in debug output
authorJeremy Harris <jgh146exb@wizmail.org>
Thu, 26 Oct 2017 17:43:55 +0000 (18:43 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Thu, 26 Oct 2017 17:43:55 +0000 (18:43 +0100)
Solaris printf %p gives hex without a leading 0x

test/runtest

index 8f8767af4566445ed2cfa6a7f831da13cb5fcbdf..94ecd69440f71c5c99c3753b194259dbb65545ab 100755 (executable)
@@ -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