diff options
author | Tony Cook <tony@develop-help.com> | 2022-06-08 16:06:17 +1000 |
---|---|---|
committer | Tony Cook <tony@develop-help.com> | 2022-06-09 10:41:10 +1000 |
commit | ea43bc00e1113f20fcdaad30e3cd4f7ec3366200 (patch) | |
tree | 7390656921fce9de9d5fd341528155c3f097bcfd /Makefile.SH | |
parent | 0bad81dad0b3d5d00dd27fa58db4dc6bed07b8b0 (diff) | |
download | perl-ea43bc00e1113f20fcdaad30e3cd4f7ec3366200.tar.gz |
minitest_prep conflict on building $(MINIPERL_EXE)
minitest depends on $(MINIPERL_EXE) and minitest_prep, but
minitest_prep calls back into make to build lib/Config.pm which
indirectly depends on $(MINIPERL_EXE).
This can result in a race between the parallel work of the parent
make and the work of the child make, as they both try to build
$(MINIPERL_EXE) and its dependencies, causing some of the errors
described in the ticket.
Note that trying to `make -j6 minitest all` could lead to
similar conflicts, but I think that's an unlikely and not worth
supporting anyway.
Fixes #19829 (I think)
Diffstat (limited to 'Makefile.SH')
-rwxr-xr-x | Makefile.SH | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.SH b/Makefile.SH index 56be38553c..a661f288ff 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -1633,7 +1633,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!' # minitest can't depend on lib/Config.pm because that might be where miniperl # is crashing. -minitest_prep: +minitest_prep: $(MINIPERL_EXE) -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles) @echo " " @echo "You may see some irrelevant test failures if you have been unable" @@ -1643,10 +1643,10 @@ minitest_prep: MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t -minitest: $(MINIPERL_EXE) minitest_prep +minitest: minitest_prep cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) -minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep +minitest-notty minitest_notty: minitest_prep cd t && PERL_SKIP_TTY_TEST=1 $(RUN_PERL) TEST $(MINITEST_TESTS) # Test via harness |