Testsuite: munge dumpdb output

diff --git a/test/runtest b/test/runtest
index 781ea97d114689a4c3cdb9bfa69b2f52abc06997..efbd8487774948dadad591aa2c40d74954fd4399 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -468,6 +468,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   # This message sometimes has a different number of seconds
   s/forced fail after \d seconds/forced fail after d seconds/;
 
   # This message sometimes has a different number of seconds
   s/forced fail after \d seconds/forced fail after d seconds/;
 

+  # This message may contain a different DBM library name
+  s/Failed to open \S+( \([^\)]+\))? file/Failed to open hintsdb file/;
+

   # The message for a non-listening FIFO varies
   s/:[^:]+: while opening named pipe/: Error: while opening named pipe/;
 
   # The message for a non-listening FIFO varies
   s/:[^:]+: while opening named pipe/: Error: while opening named pipe/;
 


@@ -1053,7 +1056,8 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/^(Connection request from) \[.*:.*:.*\]$/$1 \[ipv6\]/;
 
     # Hints DB use of lockfiles is provider-dependent
     s/^(Connection request from) \[.*:.*:.*\]$/$1 \[ipv6\]/;
 
     # Hints DB use of lockfiles is provider-dependent

-    s/Failed to open \K(?:hintsdb|database lock) file (.*\/spool\/db\/[^.]*)(?:.lockfile)?(?=(?: for reading)?: No such file or directory$)/hintsdb $1/;
+    s/Failed to open \K(?:hintsdb|database lock) file (.*\/spool\/db\/[^. ]*)(?:.lockfile)?(?: for reading)?(?=: No such file or directory$)/hintsdb $1/;
+

 
     # openssl version variances
   # Error lines on stdout from SSL contain process id values and file names.
 
     # openssl version variances
   # Error lines on stdout from SSL contain process id values and file names.