Testsuite: stabilize disk space/inode munging

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 71623a2f37a158514d993b4435297053bace4cef..2c76f176b052266e2fe9f9ae8911463c32145106 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -758,10 +758,6 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/Delivered\s+\d+/Delivered              nnn/;
 
 
-  # ======== Values in spool space failure message ========
-  s/space=\d+ inodes=[+-]?\d+/space=xxxxx inodes=xxxxx/;
-
-
   # ======== Filter sizes ========
   # The sizes of filter files may vary because of the substitution of local
   # filenames, logins, etc.
@@ -1028,7 +1024,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/^cmd buf flush \d+ bytes$/cmd buf flush ddd bytes/;
 
     # Spool filesystem free space changes on different systems.
-    s/^((spool|log) directory space =) \d+K (inodes =) \d+/$1 nnnnnK $3 nnnnn/;
+    s/^((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
 
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order