Fix mismerge

[exim.git] / test / scripts / 0000-Basic / 0415

diff --git a/test/scripts/0000-Basic/0415 b/test/scripts/0000-Basic/0415
index 043258fc053c6dbff5071f4b045fed8029575432..411efac16197c32794a9cc5dad764d3c32e67396 100644 (file)
--- a/test/scripts/0000-Basic/0415
+++ b/test/scripts/0000-Basic/0415
@@ -1,6 +1,6 @@
 # overflow in integer options
 1
 # overflow in integer options
 1

-exim -DARG1=4000E -bP check_spool_space
+exim -DARG1=4000Z -bP check_spool_space

 ****
 exim -DARG1=4000G -bP check_spool_space
 ****
 ****
 exim -DARG1=4000G -bP check_spool_space
 ****


@@ -8,10 +8,9 @@ exim -DARG1=4000G -bP check_spool_space
 exim -DARG1=40MK -bP check_spool_space
 ****
 1
 exim -DARG1=40MK -bP check_spool_space
 ****
 1

-exim -DARG2=4000000000.123 -bP queue_only_load
+exim -DARG2=4000000000000000.123 -bP queue_only_load

 ****
 ****

-1
-exim -DARG2=4000000.123 -bP queue_only_load
+exim -DARG2=2000000.123 -bP queue_only_load

 ****
 exim -bP finduser_retries
 ****
 ****
 exim -bP finduser_retries
 ****