1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8350774: Generated test-<testname> targets broken after JDK-8348998

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2025-04-04 13:44:36 +00:00
parent 5520ff12ec
commit 9fb3609955
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
make/RunTestsPrebuiltFindTests.gmk → make/GenerateFindTests.gmk
View File

4
make/Init.gmk
View File

@ -37,11 +37,9 @@ include MakeFileStart.gmk
include $(TOPDIR)/make/InitSupport.gmk include $(TOPDIR)/make/InitSupport.gmk
include LogUtils.gmk include LogUtils.gmk
# Force early generation of module-deps.gmk and find-tests.gmk # Force early generation of module-deps.gmk
GENERATE_MODULE_DEPS_FILE := true GENERATE_MODULE_DEPS_FILE := true
include Modules.gmk include Modules.gmk
GENERATE_FIND_TESTS_FILE := true
include FindTests.gmk
# Inclusion of this pseudo-target will cause make to execute this file # Inclusion of this pseudo-target will cause make to execute this file
# serially, regardless of -j. # serially, regardless of -j.

3
make/PreInitSupport.gmk
View File

@ -267,6 +267,9 @@ define DefineMainTargets
$$(main_targets_file): $$(main_targets_file):
@( cd $$(TOPDIR) && \ @( cd $$(TOPDIR) && \
$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-I $$(TOPDIR)/make/common SPEC=$(strip $2) )
@( cd $$(TOPDIR) && \
$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \ $$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
-I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \ -I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \
$$(MAKE_LOG_VARS) \ $$(MAKE_LOG_VARS) \

2
make/RunTestsPrebuilt.gmk
View File

@ -298,7 +298,7 @@ test-prebuilt:
@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error @$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
# We need to fill the FindTest cache before entering RunTests.gmk. # We need to fill the FindTest cache before entering RunTests.gmk.
@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) SPEC=$(SPEC) \ @cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) SPEC=$(SPEC) \
-f RunTestsPrebuiltFindTests.gmk -f GenerateFindTests.gmk
@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ @cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
TEST="$(TEST)" TEST="$(TEST)"