git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

test1222: fix for out-of-tree and no-libcurl-manual builds

Browse Source 
Before this patch this test succeeded silently and unconditionally,
when run on an out-of-tree curl build.

Also fix to exit gracefully if no libcurl manuals are found.

Fixing:
```
readline() on closed filehandle $m at ../../tests/test1222.pl line 153.
```

Cherry-picked from #17877
Closes #17892
This commit is contained in:
Viktor Szakats 2025-07-11 01:39:36 +02:00
parent 55509b045b
commit 202f0752ea
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/test1222
View File

@ -17,7 +17,7 @@ Verify deprecation statuses and versions
</name>
<command type="perl">
%SRCDIR/test1222.pl %SRCDIR/..
%SRCDIR/test1222.pl %SRCDIR/.. %PWD/..
</command>
</client>

16
tests/test1222.pl
View File

@ -32,10 +32,13 @@ use warnings;
use File::Basename;
my $root=$ARGV[0] || ".";
my $root = $ARGV[0] || ".";
my $bldroot = $ARGV[1] || ".";
my $incdir = "$root/include/curl";
my $docdir = "$root/docs";
my $docdir = "$bldroot/docs";
my $libdocdir = "$docdir/libcurl";
my $errcode = 0;
# Symbol-indexed hashes.
@ -237,8 +240,8 @@ sub scan_man_page {
# Read symbols-in-versions.
open(my $fh, "<", "$libdocdir/symbols-in-versions") ||
die "$libdocdir/symbols-in-versions";
open(my $fh, "<", "$root/docs/libcurl/symbols-in-versions") ||
die "$root/docs/libcurl/symbols-in-versions";
while(<$fh>) {
if($_ =~ /^((?:CURL|LIBCURL)\S+)\s+\S+\s*(\S*)\s*(\S*)$/) {
if($3 eq "") {
@ -251,6 +254,11 @@ while(<$fh>) {
}
close($fh);
if(!glob("$libdocdir/*.3")) {
print "curl built without the libcurl manual. Skipping test 1222.\n";
exit 0;
}
# Get header file names,
opendir(my $dh, $incdir) || die "Can't opendir $incdir";
my @hfiles = grep { /\.h$/ } readdir($dh);