moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 22:45:03 -05:00
Code Issues Releases Wiki Activity

runtests: get textaware info from curl instead of perl

Browse Source 
The MSYS system on Windows can run the test suite for curl built with
any toolset. When built with the MSYS GCC, curl uses Unix line endings,
while it uses Windows line endings when built with the MinGW GCC, and
`^O` reports 'msys' in both cases. Use the curl executable itself to
determine the line endings instead, which reports 'x86_64-pc-msys' when
built with the MSYS GCC.

Closes https://github.com/curl/curl/pull/4506
This commit is contained in:
Marcel Raad 2019-10-18 23:22:04 +02:00
parent b35fbf5265
commit cebbba9f9d
No known key found for this signature in database
GPG Key ID: 33C416EFAE4D6F02
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/runtests.pl
View File

@ -2678,6 +2678,7 @@ sub checksystem {
# This is a Windows MinGW build or native build, we need to use # This is a Windows MinGW build or native build, we need to use
# Win32-style path. # Win32-style path.
$pwd = pathhelp::sys_native_current_path(); $pwd = pathhelp::sys_native_current_path();
$has_textaware = 1;
} }
if ($libcurl =~ /(winssl|schannel)/i) { if ($libcurl =~ /(winssl|schannel)/i) {
$has_winssl=1; $has_winssl=1;
@ -3024,7 +3025,6 @@ sub checksystem {
} }
} }
} }
$has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys');
logmsg "***************************************** \n"; logmsg "***************************************** \n";