Skip to content

Resolve #2754 and #16300 - introduce a workaround for Module::Install::DSL and fixup return code for perl_parser() #20181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
demerphq merged 4 commits into from
Sep 3, 2022
Merged

Resolve #2754 and #16300 - introduce a workaround for Module::Install::DSL and fixup return code for perl_parser() #20181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a66542
op.c - work around Module::Install::DSL issue
demerphq Aug 29, 2022
795634b
Revert "postpone perl_parse() exit(0) bugfix"
demerphq Aug 29, 2022
bcb1711
Revert "Revert "set PERL_EXIT_DESTRUCT_END in all embeddings""
demerphq Aug 29, 2022
c412761
Move PERL_WAIT_FOR_CHILDREN till after we handle END blocks during de…
demerphq Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Revert "set PERL_EXIT_DESTRUCT_END in all embeddings"" 
This reverts commit 64a9c78.
  • Loading branch information
@demerphq
demerphq committed Aug 29, 2022
commit bcb171152c0799fa4b6bfb1445dd4b44adc08526
1 change: 1 addition & 0 deletions os2/perlrexx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ init_perl(int doparse)
if (!my_perl)
return 0;
perl_construct(my_perl);
PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
PL_perl_destruct_level = 1;
}
if (!doparse)
Expand Down
4 changes: 0 additions & 4 deletions t/op/blocks.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@ SKIP: {


SKIP: {
if ($^O =~ /^(MSWin32|os2)$/) {
skip "non_UNIX plafforms and PERL_EXIT_DESTRUCT_END (RT #132863)", 6;
}

fresh_perl_is(
"$testblocks BEGIN { exit 1; }",
"begin\nunitcheck\ncheck\nend",
Expand Down
1 change: 1 addition & 0 deletions win32/perllib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ RunPerl(int argc, char **argv, char **env)
if (!(my_perl = perl_alloc()))
return (1);
perl_construct(my_perl);
PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
PL_perl_destruct_level = 0;

/* PERL_SYS_INIT() may update the environment, e.g. via ansify_path().
Expand Down