diff options
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-10-18 23:22:04 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-10-20 13:06:57 +0200 |
| commit | cebbba9f9d877b6d387294e7ce990a7497795a30 (patch) | |
| tree | 8561aff2c5d5198cb6ce3ab70709773d49eb8ce2 | |
| parent | b35fbf52650f337bc790587d09a1739a65c65946 (diff) | |
runtests: get textaware info from curl instead of perl
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
| -rwxr-xr-x | tests/runtests.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index 9413f0d41..63bd2da68 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2678,6 +2678,7 @@ sub checksystem { # This is a Windows MinGW build or native build, we need to use # Win32-style path. $pwd = pathhelp::sys_native_current_path(); + $has_textaware = 1; } if ($libcurl =~ /(winssl|schannel)/i) { $has_winssl=1; @@ -3024,7 +3025,6 @@ sub checksystem { } } } - $has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys'); logmsg "***************************************** \n"; |