test613.pl: integrate mtime check for test 1445, 1446

Move check logic from postchecks to `test613.pl`.

To make these test data files XML-compliant.
Also to avoid POSIX/bash-shellisms in postcheck.

Closes #19766

diff --git a/tests/data/test1445 b/tests/data/test1445
index 705162be2d37a3381090d6c471172297235bf558..08c12c9647a8b2f470560ab8d8d6ecbd6c90884e 100644 (file)
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -3,7 +3,6 @@
 <keywords>
 FILE
 --remote-time
-notxml
 </keywords>
 </info>
 
@@ -29,8 +28,7 @@ file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-tim
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
-%PERL -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 946728000)'
+%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %LOGDIR/curl%TESTNUMBER.out 946728000
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1446 b/tests/data/test1446
index 448eefbc1f5a560f498a6c7a5537e74358545d9d..aa87ce11e193479f8abe208d739ace40b9dc9aa0 100644 (file)
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -3,16 +3,13 @@
 <keywords>
 SFTP
 --remote-time
-notxml
 </keywords>
 </info>
 
-#
 # Server-side
 <reply>
 </reply>
 
-#
 # Client-side
 <client>
 <server>
@@ -29,12 +26,10 @@ SFTP with --remote-time
 </command>
 </client>
 
-#
 # Verify data after the test has been "shot"
 <verify>
 <postcheck>
-%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
-%PERL -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)'
+%PERL %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %LOGDIR/curl%TESTNUMBER.out 978264000
 </postcheck>
 </verify>
 </testcase>

diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl
index 88c0e4968256f1ea96b08ac3990c73aa7b0e5cb9..3cccb6ed7f71d595885146bc08a76f4e284191ed 100755 (executable)
--- a/tests/libtest/test613.pl
+++ b/tests/libtest/test613.pl
@@ -83,7 +83,6 @@ if($ARGV[0] eq "prepare") {
 }
 elsif($ARGV[0] eq "postprocess") {
     my $dirname = $ARGV[1];
-    my $logfile = $ARGV[2];
 
     # Clean up the test directory
     if($^O eq 'cygwin') {
@@ -97,6 +96,14 @@ elsif($ARGV[0] eq "postprocess") {
 
     rmdir $dirname || die "$!";
 
+    if($#ARGV >= 3) {  # Verify mtime if requested
+        my $checkfile = $ARGV[2];
+        my $expected_mtime = int($ARGV[3]);
+        my $mtime = (stat($checkfile))[9];
+        exit ($mtime != $expected_mtime);
+    }
+
+    my $logfile = $ARGV[2];
     if($logfile && -s $logfile) {
         # Process the directory file to remove all information that
         # could be inconsistent from one test run to the next (e.g.