Skip to content
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.

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

Merge foreign-abi #140

Closed
wants to merge 120 commits into from
Closed
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
3cb0f00
8242502: UnexpectedDeoptimizationTest.java failed "assert(phase->type…
rwestrel Apr 15, 2020
04c6d13
8241153: Refactor HeapRegionManager::find_unavailable_from_idx to sim…
kstefanj Apr 24, 2020
94a99ab
8243246: HTTP Client sometimes gets java.io.IOException -> Invalid ch…
dfuch Apr 24, 2020
f9b816b
8242649: improve the CSS class names used for summary and details tables
jonathan-gibbons Apr 24, 2020
b4615b1
8243562: Make display of search results consistent with color scheme
hns Apr 24, 2020
e19d880
8243575: Trivial javadoc fix of j.l.i.MethodHandles::arrayElementVarH…
rgiulietti Apr 24, 2020
33d9178
8243574: java.lang.invoke.InvokerBytecodeGenerator.ClassData should b…
Apr 24, 2020
88f3861
8236129: Exe installers have wrong properties
Apr 24, 2020
bfcb340
8236464: SO_LINGER option is ignored by SSLSocket in JDK 11
XueleiFan Apr 24, 2020
05bf8dc
8243578: Shenandoah: Cleanup ShenandoahStringDedup::parallel_oops_do()
zhengyu123 Apr 24, 2020
f8ab03f
8243503: InstanceKlass::_array_name is not needed and leaks
Apr 24, 2020
5fc5cb9
8243549: sun/security/ssl/CipherSuite/NamedGroupsWithCipherSuite.java…
Apr 24, 2020
b0739f4
8243590: Bump boot jdk to JDK 14 on aarch64 at Oracle
vidmik Apr 26, 2020
0fd64de
8243591: Change to GCC 9.2 for building Linux/aarch64 at Oracle
vidmik Apr 26, 2020
8065665
8243568: serviceability/logging/TestLogRotation.java uses 'test.java.…
iignatev Apr 27, 2020
7fb4897
8243587: Missing comma in copyright header
Apr 27, 2020
b2db7a0
8243539: Copyright info (Year) should be updated for fix of 8241638
Apr 27, 2020
0e07f5a
8151030: PPC64: AllocatePrefetchStyle=4 is out of range
Apr 27, 2020
d07d6bd
8243576: Remove residual reference to nashorn modules in make/Compile…
sundararajana Apr 27, 2020
e34508c
8242933: jdk/jfr/api/consumer/TestHiddenMethod uses nashorn script en…
Apr 27, 2020
5d783f7
8242846: Bring back test/jdk/tools/jlink/plugins/OrderResourcesPlugin…
theaoqi Apr 27, 2020
32eb99e
8243563: Doc comments cleanup
pavelrappo Apr 27, 2020
0bbdcda
8240783: JFR: TestClose could not finish chunk
Apr 27, 2020
c55e7d5
8242034: Remove JRE_HOME references
Apr 27, 2020
d2e0d0e
8243469: Lazily encode name in ZipFile.getEntryPos
cl4es Apr 27, 2020
bdf6726
8243010: Test support: Customizable Hex Printer
Apr 16, 2020
27dc913
8243617: compiler/onSpinWait/TestOnSpinWaitC1.java test uses wrong class
iignatev Apr 27, 2020
9097c79
8243618: compiler/rtm/cli tests can be run w/o WhiteBox
iignatev Apr 27, 2020
83a6527
8243619: compiler/codecache/CheckSegmentedCodeCache.java test misses …
iignatev Apr 27, 2020
a075c32
8243621: use SkippedException in compiler/jsr292/MHInlineTest.java test
iignatev Apr 27, 2020
a3d14c6
8243622: all actions in compiler/aot/fingerprint/SelfChangedCDS.java …
iignatev Apr 27, 2020
e0f46d0
8243620: a few compiler/jvmci tests can be run in driver mode
iignatev Apr 27, 2020
d84e4f1
8243565: some gc tests use 'test.java.opts' and not 'test.vm.opts'
iignatev Apr 27, 2020
c2d3ff3
8242239: [Graal] javax/management/generified/GenericTest.java fails: …
Apr 27, 2020
9697772
8243664: JavaDoc of CompactNumberFormat points to wrong enum
Apr 27, 2020
68b189a
8243633: Remove cups dependency when building linux at Oracle
vidmik Apr 27, 2020
03f8e6c
8219607: Add support in Graal and AOT for hidden class
dean-long Apr 27, 2020
18c4324
8241815: Unnecessary calls to SystemDictionaryShared::define_shared_p…
calvinccheung Apr 28, 2020
a740f83
8243930: update copyright years
iignatev Apr 28, 2020
223ca80
8242237: Improve JVM TI HiddenClasses tests
Apr 28, 2020
3a9f764
8243928: several svc tests can be run in driver mode
iignatev Apr 28, 2020
ae9d563
8243941: build issue introduced with the push of 8242237
Apr 28, 2020
1041efe
8243946: serviceability/sa and jvmti tests fail after JDK-8243928
iignatev Apr 28, 2020
538e005
8242459: ForceNUMA and only one available NUMA node hits a guarantee
Apr 28, 2020
9cea1a5
8243954: serviceability/logging/TestQuotedLogOutputs.java fails after…
iignatev Apr 28, 2020
6534414
8243000: javac only build fails after removal of Nashorn
Apr 28, 2020
7a937e0
8243567: Update download link of jtreg provided by Adoption Group
AnirvanSarkar Apr 28, 2020
184b433
8242999: HTTP/2 client may not handle CONTINUATION frames correctly
rhyadav Apr 28, 2020
1b0a423
8242244: Remove redundant ELF machine definitions
Apr 28, 2020
a8ffbb3
8243989: test/hotspot/jtreg/serviceability/jvmti/CanGenerateAllClassH…
Apr 28, 2020
3ed0849
8243393: Improve ReservedSpace constructor resolution
Apr 28, 2020
0b5f5d5
8243982: Fix testing documentation after JDK-8240241
magicus Apr 28, 2020
c03a9bc
8243973: Clarify difference between JAVA_OPTIONS and VM_OPTIONS
magicus Apr 28, 2020
09e8b7c
8243985: Make source generation by generatecharacter reproducible
magicus Apr 28, 2020
941643e
8242921: test/hotspot/jtreg/runtime/CompactStrings/TestMethodNames.ja…
Apr 28, 2020
87f0ff6
8243510: AbsPathsInImage.java fails on Windows
Apr 28, 2020
b723b94
8244021: Hide warning from jlink about incubating modules
magicus Apr 28, 2020
04ae3fd
8243848: Shenandoah: Windows build fails after JDK-8239786
zhengyu123 Apr 28, 2020
1b16192
8243997: Linux build failed after JDK-8242244
Apr 28, 2020
f4cb2bf
8244009: Separate -Xdoclint options in CompileJavaModules.gmk
magicus Apr 28, 2020
3a416b9
8243988: Added flexibility in build system for unusal hotspot configu…
magicus Apr 28, 2020
9921097
8243942: use SkippedException in gc/arguments/TestSmallInitialHeapWit…
iignatev Apr 28, 2020
9687723
8243932: compiler/codecache/cli/printcodecache/TestPrintCodeCacheOpti…
iignatev Apr 28, 2020
f159234
8243991: Remove obsolete -XX:ThreadStackSize from java command line
magicus Apr 28, 2020
066346c
8243541: (tz) Upgrade time-zone data to tzdata2020a
Apr 28, 2020
5d2740b
8231634: SA stack walking fails with "illegal bci"
plummercj Apr 28, 2020
6911667
8243500: SA: Incorrect BCI and Line Number with jstack if the top fra…
plummercj Apr 28, 2020
70e632d
8243935: remove copying of s.h.WB$WhiteBoxPermission in hotspot tests
iignatev Apr 29, 2020
9320f9c
8243634: Add pandoc dependency when building linux-aarch64 at Oracle
vidmik Apr 29, 2020
6ff66db
8242314: use reproducible random in vmTestbase shared code
iignatev Apr 29, 2020
a9d14e1
8243944: use SkippedException and @requires in runtime/memory/ReadFro…
iignatev Apr 29, 2020
7f49c91
8244066: ClassFileInstaller should be run in driver mode
iignatev Apr 29, 2020
0783dd6
8241807: JDWP needs update for hidden classes
Apr 29, 2020
408bc48
8244036: Refresh SetupJavaCompilation, and remove support for sjavac
magicus Apr 29, 2020
739e8e3
8216557: Aarch64: Add support for Concurrent Class Unloading
Apr 29, 2020
0de9bbd
8244044: Refactor phase makefiles to be structured per module
magicus Apr 29, 2020
60e2afe
8243389: enhance os::pd_print_cpu_info on linux
Apr 29, 2020
35af52d
8244010: Simplify usages of ProcessTools.createJavaProcessBuilder in …
stefank Apr 29, 2020
fe152cd
8243666: ModuleHashes attribute generated for JMOD and JAR files depe…
Apr 29, 2020
46a67f4
8243648: Windows 32bit compile error src/jdk.incubator.jpackage/windo…
Apr 29, 2020
5bbee05
8243665: exploded-image-optimize touches module-info.class in all mod…
magicus Apr 29, 2020
313758a
8243489: Thread CPU Load event may contain wrong data for CPU time un…
mar-kolya Apr 29, 2020
478773c
8243326: Cleanup use of volatile in taskqueue code
Apr 14, 2020
354033e
8244097: make bootcycle-images fails after JDK-8244036
magicus Apr 29, 2020
d7b3692
8243929: use @requires in serviceability/attach/AttachWithStalePidFil…
iignatev Apr 29, 2020
311c9ab
8244052: remove copying of s.h.WB$WhiteBoxPermission in test/jdk
iignatev Apr 29, 2020
e7aafcd
8243933: use driver mode in gc tests
iignatev Apr 29, 2020
f0b37f1
8239569: PublicMethodsTest.java failed due to NPE in java.base/java.n…
rwestrel Apr 23, 2020
bef54e0
8243673: Mac signing process should not use --deep arg
Apr 29, 2020
25e0f47
8244051: AbsPathsInImage.java still fails on Windows
Apr 29, 2020
5c70479
8244061: Disable jvmci/graal/aot when building linux-aarch64 at Oracle
vidmik Apr 29, 2020
560da25
8243598: Typos in java.lang.invoke package-info
Apr 29, 2020
8a7ff65
8242522: Minor LingeredApp improvements
Apr 29, 2020
d813a88
Added tag jdk-15+21 for changeset 12b55fad80f3
JesperIRL Apr 30, 2020
e93cd7e
8243155: AArch64: Add support for SqrtVF
Apr 29, 2020
46fe7e3
8243945: use driver mode in runtime tests
iignatev Apr 30, 2020
e513aca
8214797: TestJmapCoreMetaspace.java timed out
plummercj Apr 30, 2020
05b3bc5
8243573: Shenandoah: rename GCParPhases and related code
shipilev Apr 30, 2020
68e5306
8240679: ZGC GarbageCollectorMXBean reports inaccurate post GC heap s…
pliden Apr 30, 2020
3153373
8242898: Clean up InstanceKlass::_array_klasses
Apr 30, 2020
5b86c4a
Merge
Apr 30, 2020
d74e4f2
8243572: Multiple tests fail with assert(cld->klasses() != 0LL) faile…
Apr 30, 2020
c37bd06
8244107: Incorrect parameters in ReservedSpace constructor change
Apr 30, 2020
a0ed53b
8243427: use reproducible random in :vmTestbase_vm_mlvm
iignatev Apr 30, 2020
1e1c724
8243428: use reproducible random in :vmTestbase_vm_compiler
iignatev Apr 30, 2020
38e6f36
8244180: Shenandoah: carry Phase to ShWorkerTimingsTracker explicitly
shipilev Apr 30, 2020
7f877f6
8243495: Shenandoah: print root statistics for concurrent weak/strong…
shipilev Apr 30, 2020
2278680
8241793: Shenandoah: Enable concurrent class unloading for aarch64
zhengyu123 Apr 30, 2020
a15b1ea
8244210: The javac server is never used
Apr 30, 2020
2ebf5a2
8244152: Remove unnecessary hash map resize in LocaleProviderAdapters
Apr 30, 2020
eddab11
8225068: Remove DocuSign root certificate that is expiring in May 2020
Apr 30, 2020
a0d04ad
8244173: Uncomment subtest in runtime/InvocationTests/invocationC1Tes…
Apr 30, 2020
908e576
8219536: Add Option for user defined jlink options
Apr 30, 2020
07cb35a
8244087: 2020-04-24 public suffix list update
wangweij May 1, 2020
60b4157
8243628: Deprecate -XX:ForceNUMA option
May 1, 2020
ad3a6fa
Automatic merge of jdk:master into master
May 1, 2020
4397c2d
Automatic merge of master into foreign-memaccess
May 1, 2020
0783de0
Automatic merge of foreign-memaccess into foreign-abi
May 1, 2020
32bfab1
Merge branch 'foreign-jextract' into openjdk-bot-31
mcimadamore May 1, 2020
e3e198b
Move jextract-related build file to new module-dependent locations
mcimadamore May 1, 2020
File filter...
Filter file types
Jump to…
The table of contents is too big for display.

Always

Just for now

@@ -631,3 +631,4 @@ dd5198db2e5b1ebcafe065d987c03ba9fcb50fc3 jdk-15+17
44aef192b488a48cce12422394691a6b1d16b98e jdk-15+18
7cc27caabe6e342151e8baf549beb07a9c755ec2 jdk-15+19
46bca5e5e6fb26efd07245d26fe96a9c3260f51e jdk-15+20
12b55fad80f30d24b1f8fdb3b947ea6465ef9518 jdk-15+21
@@ -197,13 +197,15 @@ CP=$ANT_HOME/lib/ant.jar
rm -rf $CLASSES; mkdir $CLASSES

if [ "x$CYGPATH" = "x" ] ; then ## CYGPATH may be set in env.cfg
JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java
JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
JAVAC_CLASSES=$CLASSES
JAVAC_CP=$CP
else
JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java`
JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
JAVAC_CLASSES=`cygpath -am $CLASSES`
JAVAC_CP=`cygpath -am $CP`
fi

$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -cp $JAVAC_CP $JAVAC_SOURCE_FILE
$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
@@ -578,7 +578,7 @@ <h4 id="advanced-make-control-variables">Advanced Make Control Variables</h4>
</ul>
<h2 id="running-tests">Running Tests</h2>
<p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
<p>To execute the most basic tests (tier 1), use:</p>
<pre><code>make run-test-tier1</code></pre>
<p>For more details on how to run tests, please see the <a href="testing.html">Testing the JDK</a> document.</p>
@@ -891,7 +891,7 @@ containing `lib/jtreg.jar` etc.

The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
recent builds of jtreg [here](
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact).
https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
`jtreg` directory that you just unpacked.

@@ -56,7 +56,7 @@ <h2 id="using-make-test-the-run-test-framework">Using &quot;make test&quot; (the
$ make test-jdk_lang JTREG=&quot;JOBS=8&quot;
$ make test TEST=jdk_lang
$ make test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot; GTEST=&quot;REPEAT=-1&quot;
$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
$ make test TEST=&quot;jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java&quot;
$ make test TEST=&quot;micro:java.lang.reflect&quot; MICRO=&quot;FORK=1;WARMUP_ITER=2&quot;
$ make exploded-test TEST=tier2</code></pre>
@@ -106,8 +106,8 @@ <h2 id="test-results-and-summary">Test results and summary</h2>
<h2 id="test-suite-control">Test suite control</h2>
<p>It is possible to control various aspects of the test suites using make control variables.</p>
<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT_FACTOR=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would just pass unnoticed.</p>
<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
<p>As far as possible, the names of the keywords have been standardized between test suites.</p>
<h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
<p>Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don't want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.</p>
@@ -116,16 +116,16 @@ <h4 id="jobs">JOBS</h4>
<p>Currently only applies to JTReg.</p>
<h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
<p>Currently only applies to JTReg.</p>
<h4 id="vm_options">VM_OPTIONS</h4>
<p>Applies to JTReg, GTest and Micro.</p>
<h4 id="java_options">JAVA_OPTIONS</h4>
<p>Applies to JTReg, GTest and Micro.</p>
<h4 id="vm_options">VM_OPTIONS</h4>
<p>Applies to JTReg, GTest and Micro.</p>
<h4 id="aot_modules">AOT_MODULES</h4>
<p>Applies to JTReg and GTest.</p>
<h4 id="jcov">JCOV</h4>
<p>This keywords applies globally to the test runner system. If set to <code>true</code>, it enables JCov coverage reporting for all tests run. To be useful, the JDK under test must be run with a JDK built with JCov instrumentation (<code>configure --with-jcov=&lt;path to directory containing lib/jcov.jar&gt;</code>, <code>make jcov-image</code>).</p>
<p>The simplest way to run tests with JCov coverage report is to use the special target <code>jcov-test</code> instead of <code>test</code>, e.g. <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov image is built, and that JCov reporting is enabled.</p>
<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output</code>.</p>
<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
<p>Please note that running with JCov reporting can be very memory intensive.</p>
<h4 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h4>
<p>While collecting code coverage with JCov, it is also possible to find coverage for only recently changed code. JCOV_DIFF_CHANGESET specifies a source revision. A textual report will be generated showing coverage of the diff between the specified revision and the repository tip.</p>
@@ -166,9 +166,10 @@ <h4 id="options">OPTIONS</h4>
<p>Additional options to the JTReg test framework.</p>
<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
<h4 id="java_options-1">JAVA_OPTIONS</h4>
<p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
<p>Additional Java options for running test classes (sent to JTReg as <code>-javaoption</code>).</p>
<h4 id="vm_options-1">VM_OPTIONS</h4>
<p>Additional VM options to JTReg (<code>-vmoption</code>).</p>
<p>Additional Java options to be used when compiling and running classes (sent to JTReg as <code>-vmoption</code>).</p>
<p>This option is only needed in special circumstances. To pass Java options to your test classes, use <code>JAVA_OPTIONS</code>.</p>
<h4 id="aot_modules-1">AOT_MODULES</h4>
<p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
<h4 id="retry_count">RETRY_COUNT</h4>
@@ -23,7 +23,7 @@ Some example command-lines:
$ make test-jdk_lang JTREG="JOBS=8"
$ make test TEST=jdk_lang
$ make test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
$ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
$ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT_FACTOR=8;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
$ make test TEST="jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java"
$ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2"
$ make exploded-test TEST=tier2
@@ -190,11 +190,11 @@ pass unnoticed.
To separate multiple keyword=value pairs, use `;` (semicolon). Since the shell
normally eats `;`, the recommended usage is to write the assignment inside
qoutes, e.g. `JTREG="...;..."`. This will also make sure spaces are preserved,
as in `JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.
as in `JTREG="JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.

(Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT_FACTOR=8`.
Also, as a special technique, the string `%20` will be replaced with space for
certain options, e.g. `JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
certain options, e.g. `JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
This can be useful if you have layers of scripts and have trouble getting
proper quoting of command line arguments through.)

@@ -218,11 +218,11 @@ Currently only applies to JTReg.

Currently only applies to JTReg.

#### VM_OPTIONS
#### JAVA_OPTIONS

Applies to JTReg, GTest and Micro.

#### JAVA_OPTIONS
#### VM_OPTIONS

Applies to JTReg, GTest and Micro.

@@ -250,7 +250,7 @@ Please note that running with JCov reporting can be very memory intensive.
While collecting code coverage with JCov, it is also possible to find coverage
for only recently changed code. JCOV_DIFF_CHANGESET specifies a source
revision. A textual report will be generated showing coverage of the diff
between the specified revision and the repository tip.
between the specified revision and the repository tip.

The report is stored in `build/$BUILD/test-results/jcov-output/diff_coverage_report`
file.
@@ -331,10 +331,15 @@ Additional options to the JTReg test framework.
Use `JTREG="OPTIONS=--help all"` to see all available JTReg options.

#### JAVA_OPTIONS
Additional Java options to JTReg (`-javaoption`).
Additional Java options for running test classes (sent to JTReg as
`-javaoption`).

#### VM_OPTIONS
Additional VM options to JTReg (`-vmoption`).
Additional Java options to be used when compiling and running classes (sent to
JTReg as `-vmoption`).

This option is only needed in special circumstances. To pass Java options to
your test classes, use `JAVA_OPTIONS`.

#### AOT_MODULES

@@ -33,7 +33,6 @@ include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
include NativeCompilation.gmk
include SetupJavaCompilers.gmk
include TextFileProcessing.gmk
include ZipArchive.gmk

@@ -93,7 +92,6 @@ COPY_TO_IMAGE := *.html *.txt *.png *.xml README*
# EXTRA_COPY_TO_IMAGE Additional files to copy to images (as wildcards)
# EXTRA_MANIFEST_ATTR Extra manifest attribute
# SKIP_COMPILATION Skip Java compilation iff true
# DISABLE_SJAVAC Passed to SetupJavaCompilation
# DISABLED_WARNINGS Additional disabled warnings
SetupBuildDemo = $(NamedParamsMacroTemplate)
define SetupBuildDemoBody
@@ -126,7 +124,7 @@ define SetupBuildDemoBody

ifneq ($$($1_SKIP_COMPILATION), true)
$$(eval $$(call SetupJavaCompilation, BUILD_DEMO_$1, \
SETUP := GENERATE_USINGJDKBYTECODE, \
TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
SRC := $$($1_MAIN_SRC) $$($1_EXTRA_SRC_DIR), \
BIN := $(SUPPORT_OUTPUTDIR)/demos/classes/$$($1_DEMO_SUBDIR)/$1, \
COPY := $(COPY_TO_JAR) $$($1_EXTRA_COPY_TO_JAR), \
@@ -137,7 +135,6 @@ define SetupBuildDemoBody
SRCZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
DISABLED_WARNINGS := $$($1_DISABLED_WARNINGS), \
DISABLE_SJAVAC := $$($1_DISABLE_SJAVAC), \
))

$1 += $$(BUILD_DEMO_$1)
@@ -183,7 +180,6 @@ $(eval $(call SetupBuildDemo, SwingSet2, \
EXTRA_COPY_TO_JAR := .java, \
EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast, \
DISABLE_SJAVAC := true, \
))

$(eval $(call SetupBuildDemo, Font2DTest, \
@@ -29,7 +29,6 @@ default: all
include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
include SetupJavaCompilers.gmk
include Modules.gmk

################################################################################
@@ -66,8 +65,8 @@ TARGETS += $(COPY_PREVIEW_FEATURES)
# Param 1 - Name of module to compile
define SetupInterimModule
$$(eval $$(call SetupJavaCompilation, BUILD_$1.interim, \
SETUP := BOOT_JAVAC, \
DISABLE_SJAVAC := true, \
COMPILER := bootjdk, \
TARGET_RELEASE := $$(TARGET_RELEASE_BOOTJDK), \
SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
$$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
$(TOPDIR)/src/$1/share/classes, \
@@ -77,8 +76,9 @@ define SetupInterimModule
EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java, \
COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
DISABLED_WARNINGS := module, \
ADD_JAVAC_FLAGS := --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
DISABLED_WARNINGS := module options, \
JAVAC_FLAGS := \
--module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
$$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
--patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
--add-exports java.base/jdk.internal=java.compiler.interim \
ProTip! Use n and p to navigate between commits in a pull request.