Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0699 b/test/scripts/0000-Basic/0699
index 20389ff533ac7514671361f790aa6f1e41cb8fca..7bc0ecbe2de534b33d68c5854ff6dccbce4df34a 100644 (file)
--- a/test/scripts/0000-Basic/0699
+++ b/test/scripts/0000-Basic/0699
@@ -1,18 +1,20 @@
 # message ID format manipulation
 # This testcase is for the 4.97 message-id format changeover
 # message ID format manipulation
 # This testcase is for the 4.97 message-id format changeover

-# should can be dropped after a few further releases.
+# should be dropped after a few further releases.

 #
 # Ensure spooldir exists
 sudo mkdir -p DIR/spool/input
 #
 #
 # Ensure spooldir exists
 sudo mkdir -p DIR/spool/input
 #

-# Check that delivery of old-format spoolfiles works
+### Check that delivery of old-format spoolfiles works

 sudo cp DIR/aux-fixed/TESTNUM/* DIR/spool/input/
 sudo chown -R EXIMUSER:EXIMGROUP DIR/spool/input/
 sudo chmod -R 640 DIR/spool/input/*
 sudo cp DIR/aux-fixed/TESTNUM/* DIR/spool/input/
 sudo chown -R EXIMUSER:EXIMGROUP DIR/spool/input/
 sudo chmod -R 640 DIR/spool/input/*

+exim -bp
+****

 exim -q
 ****
 #
 exim -q
 ****
 #

-# Check that the format-mangler utility can downgrade spoolfiles
+### Check that the format-mangler utility can downgrade spoolfiles

 exim -odq nulldeliver@test.ex
 Subject: originally-new id format spoolfile
 
 exim -odq nulldeliver@test.ex
 Subject: originally-new id format spoolfile
 


@@ -26,7 +28,7 @@ exim -bp
 exim -q
 ****
 #
 exim -q
 ****
 #

-# Check that the format-mangler utility can upgrade spoolfiles
+### Check that the format-mangler utility can upgrade spoolfiles

 sudo cp DIR/aux-fixed/TESTNUM/* DIR/spool/input/
 sudo chown -R EXIMUSER:EXIMGROUP DIR/spool/input/
 sudo chmod -R 640 DIR/spool/input/*
 sudo cp DIR/aux-fixed/TESTNUM/* DIR/spool/input/
 sudo chown -R EXIMUSER:EXIMGROUP DIR/spool/input/
 sudo chmod -R 640 DIR/spool/input/*


@@ -37,4 +39,6 @@ exim -q
 ****
 #
 #
 ****
 #
 #

+### done

 no_msglog_check
 no_msglog_check

+no_stderr_check