From 1ab2efb0efca290b4b19de654de9bdc3e0aec1c9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 7 Mar 2024 22:30:50 +0100 Subject: [PATCH] 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 --- tests/data/test1140 | 2 +- tests/data/test1173 | 2 +- tests/test1140.pl | 2 +- tests/test1173.pl | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) 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 -%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 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 -%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 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; -- 2.47.3