romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-17 13:26:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

runtests: check and report if diff tool is missing

Browse source 
To make it apparent which CI jobs are missing this tool, so we can
install it to improve the runtests log.

Correction to the followed-up commit: `diff` is not installed via the
`gcc` package but via `automake`. Meaning it needs be installed manually
for MSYS cmake jobs.

Follow-up to e6c78e18da #16571
Closes #16578
This commit is contained in:
Viktor Szakats 2025-03-05 18:38:57 +01:00
parent b06c12b724
commit 2485d3edaa
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/runtests.pl
View file

@ -416,6 +416,9 @@ sub showdiff {
if(!$out[0]) {
@out = `diff -c $file2 $file1 2>$dev_null`;
if(!$out[0]) {
logmsg "Failed to show diff. The diff tool may be missing.\n";
}
}
return @out;
@ -852,6 +855,14 @@ sub checksystemfeatures {
chomp $hosttype;
my $hostos=$^O;
my $havediff;
if(system("diff $TESTDIR/DISABLED $TESTDIR/DISABLED 2>$dev_null") == 0) {
$havediff = 'available';
}
else {
$havediff = 'missing';
}
# display summary information about curl and the test host
logmsg ("********* System characteristics ******** \n",
"* $curl\n",
@ -863,6 +874,7 @@ sub checksystemfeatures {
"* System: $hosttype\n",
"* OS: $hostos\n",
"* Perl: $^V ($^X)\n",
"* diff: $havediff\n",
"* Args: $args\n");
if($jobs) {