Skip to content

Commit

Permalink
Remove bogus "perl not found" on Windows.
Browse files Browse the repository at this point in the history
Testing exit code from popen(), comparing it with 1, and deciding that
perl.exe is not there, is a) wrong conclusion, and b) uninteresting,
because MTR always runs with perl, and with MTR_PERL set.

Background:
Recent change in 7af50e4 introduced
exit code 1 from perl snippet, that broke Windows CI. Do not want
to debug this ever again.
  • Loading branch information
vaintroub committed Jan 25, 2024
1 parent 9d88c5b commit c9c4f15
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions client/mysqltest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4648,15 +4648,11 @@ void do_perl(struct st_command *command)

/* Check for error code that indicates perl could not be started */
int exstat= WEXITSTATUS(error);
#ifdef _WIN32
if (exstat == 1)
/* Text must begin 'perl not found' as mtr looks for it */
abort_not_supported_test("perl not found in path or did not start");
#else
#ifndef _WIN32
if (exstat == 127)
abort_not_supported_test("perl not found in path");
#endif
else
#endif
handle_command_error(command, exstat, my_errno);
}
dynstr_free(&ds_delimiter);
Expand Down

0 comments on commit c9c4f15

Please sign in to comment.