From 3c1a88fdf72e9e43f289d121318fc31536964e66 Mon Sep 17 00:00:00 2001 From: Samuel Henrique Date: Sat, 8 Mar 2025 12:47:21 +0000 Subject: [PATCH] test1022: add support for rc releases Fix the following test failure: curl-config: illegal value Closes #16626 --- tests/libtest/test1022.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl index 583b8f8562..5c5c02070f 100755 --- a/tests/libtest/test1022.pl +++ b/tests/libtest/test1022.pl @@ -35,7 +35,7 @@ my $what=$ARGV[2]; open(CURL, "$ARGV[1]") || die "Can't open curl --version list in $ARGV[1]\n"; $_ = ; chomp; -/libcurl\/([\.\d]+((-DEV)|(-\d+))?)/; +/libcurl\/([\.\d]+((-DEV)|(-rc\d)|(-\d+))?)/; my $version = $1; close CURL; @@ -47,7 +47,7 @@ $_ = ; chomp; my $filever=$_; if ( $what eq "version" ) { - if($filever =~ /^libcurl ([\.\d]+((-DEV)|(-\d+))?)$/) { + if($filever =~ /^libcurl ([\.\d]+((-DEV)|(-rc\d)|(-\d+))?)$/) { $curlconfigversion = $1; } else { @@ -63,7 +63,7 @@ else { # "vernum" case $curlconfigversion = "illegal value"; } - # Strip off the -DEV from the curl version if it's there + # Strip off the -DEV and -rc suffixes from the curl version if they're there $version =~ s/-\w*$//; } close CURLCONFIG; -- 2.47.3