From 6d2b603c9f0d7b97f235b4b9930f3192c8b809a0 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 8 Mar 2023 16:23:04 +0800
Subject: [PATCH] fix test973 test974 test975 test976

e6b21d runtests: provide curl's version string as %VERSION for tests
f60f51 runtests: init $VERSION to avoid warnings when using -l

merge f60f51721c656a96afa5ba9b6a5913a705f6bc60 and e6b21d422e631a7c0cc81abf956af179b3b4c5e8

Conflict: remove all files in the tests/data directory, remove tests/FILEFORMAT.md
Reference: https://github.com/curl/curl/commit/f60f51721c656a96afa5ba9b6a5913a705f6bc60
https://github.com/curl/curl/commit/e6b21d422e631a7c0cc81abf956af179b3b4c5e8
---
 tests/runtests.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 0743d49..94f265a 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -166,6 +166,7 @@ my $NEGTELNETPORT=$noport; # TELNET server port with negotiation
 my $HTTPUNIXPATH;        # HTTP server Unix domain socket path

 my $SSHSRVMD5 = "[uninitialized]"; # MD5 of ssh server public key
+my $VERSION="";          # curl's reported version number

 my $srcdir = $ENV{'srcdir'} || '.';
 my $CURL="../src/curl".exe_ext('TOOL'); # what curl executable to run on the tests
@@ -2897,8 +2898,9 @@ sub checksystem {
     for(@version) {
         chomp;

-        if($_ =~ /^curl/) {
+       if($_ =~ /^curl ([^ ]*)/) {
             $curl = $_;
+           $VERSION = $1;
             $curl =~ s/^(.*)(libcurl.*)/$1/g;

             $libcurl = $2;
@@ -3302,6 +3304,7 @@ sub subVariables {
     $$thing =~ s/${prefix}CURL/$CURL/g;
     $$thing =~ s/${prefix}PWD/$pwd/g;
     $$thing =~ s/${prefix}POSIX_PWD/$posix_pwd/g;
+    $$thing =~ s/${prefix}VERSION/$VERSION/g;

     my $file_pwd = $pwd;
     if($file_pwd !~ /^\//) {
--
2.27.0
