From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 7 Mar 2024 21:30:50 +0000 (+0100)
Subject: test1140/1173: extend wildcards to find curl.1
X-Git-Tag: curl-8_7_0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ab2efb0efca290b4b19de654de9bdc3e0aec1c9;p=thirdparty%2Fcurl.git

test1140/1173: extend wildcards to find curl.1

... in its new build path.

Also update the test scripts to be more precise in error messages to
help us understand CI errors better.

Follow-up to f03c85635f35269f1
Ref: #13029
Closes #13083
---

diff --git a/tests/data/test1140 b/tests/data/test1140
index aec680ce5b..2e4d8daf2f 100644
--- a/tests/data/test1140
+++ b/tests/data/test1140
@@ -19,7 +19,7 @@ Verify the nroff of manpages
 </name>
 
 <command type="perl">
-%SRCDIR/test1140.pl %PWD/../docs/ %PWD/../docs/libcurl/*.3 %PWD/../docs/libcurl/opts/*.3 %PWD/../docs/*.1
+%SRCDIR/test1140.pl %PWD/../docs/ %PWD/../docs/libcurl/*.3 %PWD/../docs/libcurl/opts/*.3 %PWD/../docs/*.1 %PWD/../docs/cmdline-opts/*.1
 </command>
 </client>
 
diff --git a/tests/data/test1173 b/tests/data/test1173
index 97d338df30..ff786c44bd 100644
--- a/tests/data/test1173
+++ b/tests/data/test1173
@@ -19,7 +19,7 @@ Man page syntax checks
 </name>
 
 <command type="perl">
-%SRCDIR/test1173.pl %SRCDIR/../docs/libcurl/symbols-in-versions %PWD/../docs/*.1  %PWD/../docs/libcurl/*.3 %PWD/../docs/libcurl/opts/*.3
+%SRCDIR/test1173.pl %SRCDIR/../docs/libcurl/symbols-in-versions %PWD/../docs/*.1  %PWD/../docs/cmdline-opts/*.1 %PWD/../docs/libcurl/*.3 %PWD/../docs/libcurl/opts/*.3
 </command>
 </client>
 
diff --git a/tests/test1140.pl b/tests/test1140.pl
index 6ad346ea67..8e1f122985 100755
--- a/tests/test1140.pl
+++ b/tests/test1140.pl
@@ -57,7 +57,7 @@ sub manpresent {
 sub file {
     my ($f) = @_;
     open(my $fh, "<", "$f") ||
-        die "no file";
+        die "test1140.pl could not open $f";
     my $line = 1;
     while(<$fh>) {
         chomp;
diff --git a/tests/test1173.pl b/tests/test1173.pl
index 7457c7d44c..bf03c98cd8 100755
--- a/tests/test1173.pl
+++ b/tests/test1173.pl
@@ -132,7 +132,8 @@ sub scanmanpage {
     my @separators;
     my @sepline;
 
-    open(my $m, "<", "$file") || die "no such file: $file";
+    open(my $m, "<", "$file") ||
+        die "test1173.pl could not open $file";
     if($file =~ /[\/\\](CURL|curl_)[^\/\\]*.3/) {
         # This is a man page for libcurl. It requires an example!
         $reqex = 1;