From be61f129c1f933cc0c7c9ab793b840df63180366 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 Aug 2025 14:43:11 +0200 Subject: [PATCH] cleanups-2 --- .github/workflows/windows.yml | 2 +- tests/processhelp.pm | 1 + tests/wintest.pl | 51 ----------------------------------- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100755 tests/wintest.pl diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 82bb33a000..a5ed0c89e5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -462,7 +462,7 @@ jobs: popd popd fi - perl tests/wintest.pl + perl -I tests -e 'use processhelp qw($has_win32_process); print "! Win32::Process* loaded: " . ($has_win32_process ? "YES" : "NO") . "\n";' - name: 'run tests' if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }} diff --git a/tests/processhelp.pm b/tests/processhelp.pm index f1f8ef525a..a57935ac52 100644 --- a/tests/processhelp.pm +++ b/tests/processhelp.pm @@ -48,6 +48,7 @@ BEGIN { killallsockfilters set_advisor_read_lock clear_advisor_read_lock + $has_win32_process ); if(os_is_win() && $^O ne 'MSWin32') { diff --git a/tests/wintest.pl b/tests/wintest.pl deleted file mode 100755 index 68d5451745..0000000000 --- a/tests/wintest.pl +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env perl -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at https://curl.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -# SPDX-License-Identifier: curl -# -########################################################################### - -use strict; -use warnings; - -use Time::HiRes; - -my $has_win32_process; - -BEGIN { - if($^O eq 'cygwin' || $^O eq 'msys') { - $has_win32_process = eval { - no warnings "all"; - # https://metacpan.org/pod/Win32::Process - require Win32::Process; - # https://metacpan.org/pod/Win32::Process::List - require Win32::Process::List; - }; - } else { - $has_win32_process = 0; - } -} - -if($has_win32_process) { - print "!!! Win32::Process* modules loaded\n"; -} else { - print "!!! Win32::Process* modules NOT loaded\n"; -}