Skip to content
Snippets Groups Projects
Commit c98aa661 authored by J. Duke's avatar J. Duke
Browse files

Merge

parents ce62364d c96654e8
No related branches found
No related tags found
No related merge requests found
...@@ -145,3 +145,4 @@ a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15 ...@@ -145,3 +145,4 @@ a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15
cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21 cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21
7ad075c809952e355d25030605da6af30456ed74 jdk8-b22 7ad075c809952e355d25030605da6af30456ed74 jdk8-b22
60d6f64a86b1e511169d264727f6d51415978df0 jdk8-b23 60d6f64a86b1e511169d264727f6d51415978df0 jdk8-b23
1a5f1d6b98d6827cdb529a4abe6e52a886d944f4 jdk8-b24
...@@ -64,18 +64,32 @@ jprt.vm.default.test.targets= \ ...@@ -64,18 +64,32 @@ jprt.vm.default.test.targets= \
# Default jdk test targets (testset=default) # Default jdk test targets (testset=default)
jprt.make.rule.default.test.targets= \ jprt.make.rule.default.test.targets= \
${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \ ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_lang}, \ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
${jprt.my.test.target.set:TESTNAME=jdk_math}, \ ${jprt.my.test.target.set:TESTNAME=jdk_math}
${jprt.my.test.target.set:TESTNAME=jdk_misc}, \
# Default vm test targets (testset=core)
jprt.vm.core.test.targets= \
${jprt.vm.default.test.targets}
# Core jdk test targets (testset=core)
jprt.make.rule.core.test.targets= \
${jprt.make.rule.default.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \ ${jprt.my.test.target.set:TESTNAME=jdk_net}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \
${jprt.my.test.target.set:TESTNAME=jdk_util} ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
${jprt.my.test.target.set:TESTNAME=jdk_misc}
# All vm test targets (testset=all) # All vm test targets (testset=all)
jprt.vm.all.test.targets= \ jprt.vm.all.test.targets= \
...@@ -85,19 +99,13 @@ jprt.vm.all.test.targets= \ ...@@ -85,19 +99,13 @@ jprt.vm.all.test.targets= \
# All jdk test targets (testset=all) # All jdk test targets (testset=all)
jprt.make.rule.all.test.targets= \ jprt.make.rule.all.test.targets= \
${jprt.make.rule.default.test.targets}, \ ${jprt.make.rule.core.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_awt}, \ ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_sound}, \ ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
${jprt.my.test.target.set:TESTNAME=jdk_swing}, \ ${jprt.my.test.target.set:TESTNAME=jdk_swing}
${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
${jprt.my.test.target.set:TESTNAME=jdk_tools2}
# JCK test targets in test/Makefile (no windows) # JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \ jprt.my.jck.test.target.set= \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment