Skip to content

Commit 52da980

Browse files
committed
Merge
2 parents 833627b + ccef9ef commit 52da980

4,461 files changed

Lines changed: 124330 additions & 151009 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.hgtags

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,4 +536,18 @@ de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
536536
f15d443f97318e9b40e6f451e327ff69ed4ec361 jdk-12+27
537537
a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4
538538
659b004b6a1bd8c31e766cbdf328d8f8473fd4d7 jdk-12+28
539-
539+
e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5
540+
44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29
541+
b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6
542+
6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30
543+
021917019cda1c0c5853255322274f37693a2431 jdk-13+7
544+
b5f7bb57de2f797be34f6c75d45c3245ad37ab97 jdk-12+31
545+
a535ba736cabc6886acdff36de3a096c46e5ddc5 jdk-13+8
546+
4ce47bc1fb92cf94c6e3d1f49d582f02dcb851ab jdk-12+32
547+
c081f3ea6b9300265a4a34e38f970b1e3ddaae9f jdk-13+9
548+
b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12+33
549+
8e069f7b4fabfe05d9f500783e6d56cb0196d25c jdk-13+10
550+
21ea4076a275a0f498afa517e9ee1b94a9cf0255 jdk-13+11
551+
1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12
552+
b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12-ga
553+
83cace4142c8563b6a921787db02388e1bc48d01 jdk-13+13

doc/building.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ <h3 id="linux">Linux</h3>
237237
<p>For rpm-based distributions (Fedora, Red Hat, etc), try this:</p>
238238
<pre><code>sudo yum groupinstall &quot;Development Tools&quot;</code></pre>
239239
<h3 id="aix">AIX</h3>
240-
<p>The regular builds by SAP is using AIX version 7.1, but AIX 5.3 is also supported. See the <a href="http://cr.openjdk.java.net/~simonis/ppc-aix-port">OpenJDK PowerPC Port Status Page</a> for details.</p>
240+
<p>Please consult the AIX section of the <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a> OpenJDK Build Wiki page for details about which versions of AIX are supported.</p>
241241
<h2 id="native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requirements</h2>
242242
<p>Large portions of the JDK consists of native code, that needs to be compiled to be able to run on the target platform. In theory, toolchain and operating system should be independent factors, but in practice there's more or less a one-to-one correlation between target operating system and toolchain.</p>
243243
<table>
@@ -373,8 +373,7 @@ <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
373373
<p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2015</code>.</p>
374374
<p>If you get <code>LINK: fatal error LNK1123: failure during conversion to COFF: file invalid</code> when building using Visual Studio 2010, you have encountered <a href="http://support.microsoft.com/kb/2757355">KB2757355</a>, a bug triggered by a specific installation order. However, the solution suggested by the KB article does not always resolve the problem. See <a href="https://stackoverflow.com/questions/10888391">this stackoverflow discussion</a> for other suggestions.</p>
375375
<h3 id="ibm-xl-cc">IBM XL C/C++</h3>
376-
<p>The regular builds by SAP is using version 12.1, described as <code>IBM XL C/C++ for AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017</code>.</p>
377-
<p>See the <a href="http://cr.openjdk.java.net/~simonis/ppc-aix-port">OpenJDK PowerPC Port Status Page</a> for details.</p>
376+
<p>Please consult the AIX section of the <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a> OpenJDK Build Wiki page for details about which versions of XLC are supported.</p>
378377
<h2 id="boot-jdk-requirements">Boot JDK Requirements</h2>
379378
<p>Paradoxically, building the JDK requires a pre-existing JDK. This is called the &quot;boot JDK&quot;. The boot JDK does not, however, have to be a JDK built directly from the source code available in the OpenJDK Community. If you are porting the JDK to a new platform, chances are that there already exists another JDK for that platform that is usable as boot JDK.</p>
380379
<p>The rule of thumb is that the boot JDK for building JDK major version <em>N</em> should be a JDK of major version <em>N-1</em>, so for building JDK 9 a JDK 8 would be suitable as boot JDK. However, the JDK should be able to &quot;build itself&quot;, so an up-to-date build of the current JDK source is an acceptable alternative. If you are following the <em>N-1</em> rule, make sure you've got the latest update version, since JDK 8 GA might not be able to build JDK 9 on all platforms.</p>

doc/building.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ sudo yum groupinstall "Development Tools"
295295

296296
### AIX
297297

298-
The regular builds by SAP is using AIX version 7.1, but AIX 5.3 is also
299-
supported. See the [OpenJDK PowerPC Port Status Page](
300-
http://cr.openjdk.java.net/~simonis/ppc-aix-port) for details.
298+
Please consult the AIX section of the [Supported Build Platforms](
299+
https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms) OpenJDK
300+
Build Wiki page for details about which versions of AIX are supported.
301301

302302
## Native Compiler (Toolchain) Requirements
303303

@@ -419,11 +419,10 @@ https://stackoverflow.com/questions/10888391) for other suggestions.
419419

420420
### IBM XL C/C++
421421

422-
The regular builds by SAP is using version 12.1, described as `IBM XL C/C++ for
423-
AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017`.
422+
Please consult the AIX section of the [Supported Build Platforms](
423+
https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms) OpenJDK
424+
Build Wiki page for details about which versions of XLC are supported.
424425

425-
See the [OpenJDK PowerPC Port Status Page](
426-
http://cr.openjdk.java.net/~simonis/ppc-aix-port) for details.
427426

428427
## Boot JDK Requirements
429428

doc/testing.html

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
<!DOCTYPE html>
2-
<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
2+
<html>
33
<head>
4-
<meta charset="utf-8" />
5-
<meta name="generator" content="pandoc" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
4+
<meta charset="utf-8">
5+
<meta name="generator" content="pandoc">
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
77
<title>Testing the JDK</title>
8-
<style type="text/css">
9-
code{white-space: pre-wrap;}
10-
span.smallcaps{font-variant: small-caps;}
11-
span.underline{text-decoration: underline;}
12-
div.column{display: inline-block; vertical-align: top; width: 50%;}
13-
</style>
14-
<link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
8+
<style type="text/css">code{white-space: pre;}</style>
9+
<link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css">
1510
<!--[if lt IE 9]>
1611
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
1712
<![endif]-->
1813
<style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
1914
</head>
2015
<body>
21-
<header id="title-block-header">
16+
<header>
2217
<h1 class="title">Testing the JDK</h1>
2318
</header>
2419
<nav id="TOC">
@@ -34,6 +29,7 @@ <h1 class="title">Testing the JDK</h1>
3429
</ul></li>
3530
<li><a href="#test-results-and-summary">Test results and summary</a></li>
3631
<li><a href="#test-suite-control">Test suite control</a><ul>
32+
<li><a href="#general-keywords-test_opts">General keywords (TEST_OPTS)</a></li>
3733
<li><a href="#jtreg-keywords">JTReg keywords</a></li>
3834
<li><a href="#gtest-keywords">Gtest keywords</a></li>
3935
<li><a href="#microbenchmark-keywords">Microbenchmark keywords</a></li>
@@ -102,11 +98,29 @@ <h2 id="test-suite-control">Test suite control</h2>
10298
<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>
10399
<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=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>
104100
<p>As far as possible, the names of the keywords have been standardized between test suites.</p>
105-
<h3 id="jtreg-keywords">JTReg keywords</h3>
101+
<h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
102+
<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>
103+
<p>There are also some keywords that applies globally to the test runner system, not to any specific test suites. These are also available as TEST_OPTS keywords.</p>
106104
<h4 id="jobs">JOBS</h4>
105+
<p>Currently only applies to JTReg.</p>
106+
<h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
107+
<p>Currently only applies to JTReg.</p>
108+
<h4 id="vm_options">VM_OPTIONS</h4>
109+
<p>Applies to JTReg, GTest and Micro.</p>
110+
<h4 id="java_options">JAVA_OPTIONS</h4>
111+
<p>Applies to JTReg, GTest and Micro.</p>
112+
<h4 id="aot_modules">AOT_MODULES</h4>
113+
<p>Applies to JTReg and GTest.</p>
114+
<h4 id="jcov">JCOV</h4>
115+
<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>
116+
<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>
117+
<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output</code>.</p>
118+
<p>Please note that running with JCov reporting can be very memory intensive.</p>
119+
<h3 id="jtreg-keywords">JTReg keywords</h3>
120+
<h4 id="jobs-1">JOBS</h4>
107121
<p>The test concurrency (<code>-concurrency</code>).</p>
108-
<p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em>, but never more than 12.</p>
109-
<h4 id="timeout">TIMEOUT</h4>
122+
<p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em> (for sparc, if more than 16 cpus, then <em>number of CPU cores/5</em>, otherwise <em>number of CPU cores/4</em>), but never more than <em>memory size in GB/2</em>.</p>
123+
<h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
110124
<p>The timeout factor (<code>-timeoutFactor</code>).</p>
111125
<p>Defaults to 4.</p>
112126
<h4 id="test_mode">TEST_MODE</h4>
@@ -125,20 +139,30 @@ <h4 id="max_mem">MAX_MEM</h4>
125139
<p>Limit memory consumption (<code>-Xmx</code> and <code>-vmoption:-Xmx</code>, or none).</p>
126140
<p>Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.</p>
127141
<p>Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).</p>
142+
<h4 id="keywords">KEYWORDS</h4>
143+
<p>JTReg kewords sent to JTReg using <code>-k</code>. Please be careful in making sure that spaces and special characters (like <code>!</code>) are properly quoted. To avoid some issues, the special value <code>%20</code> can be used instead of space.</p>
144+
<h4 id="extra_problem_lists">EXTRA_PROBLEM_LISTS</h4>
145+
<p>Use additional problem lists file or files, in addition to the default ProblemList.txt located at the JTReg test roots.</p>
146+
<p>If multiple file names are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
147+
<p>The file names should be either absolute, or relative to the JTReg test root of the tests to be run.</p>
128148
<h4 id="options">OPTIONS</h4>
129149
<p>Additional options to the JTReg test framework.</p>
130150
<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
131-
<h4 id="java_options">JAVA_OPTIONS</h4>
151+
<h4 id="java_options-1">JAVA_OPTIONS</h4>
132152
<p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
133-
<h4 id="vm_options">VM_OPTIONS</h4>
153+
<h4 id="vm_options-1">VM_OPTIONS</h4>
134154
<p>Additional VM options to JTReg (<code>-vmoption</code>).</p>
155+
<h4 id="aot_modules-1">AOT_MODULES</h4>
156+
<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>
135157
<h3 id="gtest-keywords">Gtest keywords</h3>
136158
<h4 id="repeat">REPEAT</h4>
137159
<p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>
138160
<p>Default is 1. Set to -1 to repeat indefinitely. This can be especially useful combined with <code>OPTIONS=--gtest_break_on_failure</code> to reproduce an intermittent problem.</p>
139161
<h4 id="options-1">OPTIONS</h4>
140162
<p>Additional options to the Gtest test framework.</p>
141163
<p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
164+
<h4 id="aot_modules-2">AOT_MODULES</h4>
165+
<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>
142166
<h3 id="microbenchmark-keywords">Microbenchmark keywords</h3>
143167
<h4 id="fork">FORK</h4>
144168
<p>Override the number of benchmark forks to spawn. Same as specifying <code>-f &lt;num&gt;</code>.</p>
@@ -152,7 +176,7 @@ <h4 id="warmup_time">WARMUP_TIME</h4>
152176
<p>Amount of time to spend in each warmup iteration. Same as specifying <code>-w &lt;num&gt;</code>.</p>
153177
<h4 id="results_format">RESULTS_FORMAT</h4>
154178
<p>Specify to have the test run save a log of the values. Accepts the same values as <code>-rff</code>, i.e., <code>text</code>, <code>csv</code>, <code>scsv</code>, <code>json</code>, or <code>latex</code>.</p>
155-
<h4 id="vm_options-1">VM_OPTIONS</h4>
179+
<h4 id="vm_options-2">VM_OPTIONS</h4>
156180
<p>Additional VM arguments to provide to forked off VMs. Same as <code>-jvmArgs &lt;args&gt;</code></p>
157181
<h4 id="options-2">OPTIONS</h4>
158182
<p>Additional arguments to send to JMH.</p>

doc/testing.md

Lines changed: 80 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ environment variable to point to the JTReg home before running `configure`.)
4040

4141
To be able to run microbenchmarks, `configure` needs to know where to find
4242
the JMH dependency. Use `--with-jmh=<path to JMH jars>` to point to a directory
43-
containing the core JMH and transitive dependencies. The recommended dependencies
44-
can be retrieved by running `sh make/devkit/createJMHBundle.sh`, after which
43+
containing the core JMH and transitive dependencies. The recommended dependencies
44+
can be retrieved by running `sh make/devkit/createJMHBundle.sh`, after which
4545
`--with-jmh=build/jmh/jars` should work.
4646

4747
## Test selection
@@ -202,16 +202,61 @@ proper quoting of command line arguments through.)
202202
As far as possible, the names of the keywords have been standardized between
203203
test suites.
204204

205+
### General keywords (TEST_OPTS)
206+
207+
Some keywords are valid across different test suites. If you want to run
208+
tests from multiple test suites, or just don't want to care which test suite specific
209+
control variable to use, then you can use the general TEST_OPTS control variable.
210+
211+
There are also some keywords that applies globally to the test runner system,
212+
not to any specific test suites. These are also available as TEST_OPTS keywords.
213+
214+
#### JOBS
215+
216+
Currently only applies to JTReg.
217+
218+
#### TIMEOUT_FACTOR
219+
220+
Currently only applies to JTReg.
221+
222+
#### VM_OPTIONS
223+
224+
Applies to JTReg, GTest and Micro.
225+
226+
#### JAVA_OPTIONS
227+
228+
Applies to JTReg, GTest and Micro.
229+
230+
#### AOT_MODULES
231+
232+
Applies to JTReg and GTest.
233+
234+
#### JCOV
235+
236+
This keywords applies globally to the test runner system. If set to `true`, it
237+
enables JCov coverage reporting for all tests run. To be useful, the JDK under
238+
test must be run with a JDK built with JCov instrumentation (`configure
239+
--with-jcov=<path to directory containing lib/jcov.jar>`, `make jcov-image`).
240+
241+
The simplest way to run tests with JCov coverage report is to use the special
242+
target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
243+
will make sure the JCov image is built, and that JCov reporting is enabled.
244+
245+
The JCov report is stored in `build/$BUILD/test-results/jcov-output`.
246+
247+
Please note that running with JCov reporting can be very memory intensive.
248+
205249
### JTReg keywords
206250

207251
#### JOBS
208252
The test concurrency (`-concurrency`).
209253

210254
Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
211-
JOBS, except for Hotspot, where the default is *number of CPU cores/2*, but
212-
never more than 12.
255+
JOBS, except for Hotspot, where the default is *number of CPU cores/2* (for
256+
sparc, if more than 16 cpus, then *number of CPU cores/5*, otherwise *number of
257+
CPU cores/4*), but never more than *memory size in GB/2*.
213258

214-
#### TIMEOUT
259+
#### TIMEOUT_FACTOR
215260
The timeout factor (`-timeoutFactor`).
216261

217262
Defaults to 4.
@@ -245,6 +290,24 @@ to disable the limits.
245290

246291
Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
247292

293+
#### KEYWORDS
294+
295+
JTReg kewords sent to JTReg using `-k`. Please be careful in making sure that
296+
spaces and special characters (like `!`) are properly quoted. To avoid some
297+
issues, the special value `%20` can be used instead of space.
298+
299+
#### EXTRA_PROBLEM_LISTS
300+
301+
Use additional problem lists file or files, in addition to the default
302+
ProblemList.txt located at the JTReg test roots.
303+
304+
If multiple file names are specified, they should be separated by space (or, to
305+
help avoid quoting issues, the special value `%20`).
306+
307+
The file names should be either absolute, or relative to the JTReg test root of
308+
the tests to be run.
309+
310+
248311
#### OPTIONS
249312
Additional options to the JTReg test framework.
250313

@@ -256,6 +319,12 @@ Additional Java options to JTReg (`-javaoption`).
256319
#### VM_OPTIONS
257320
Additional VM options to JTReg (`-vmoption`).
258321

322+
#### AOT_MODULES
323+
324+
Generate AOT modules before testing for the specified module, or set of
325+
modules. If multiple modules are specified, they should be separated by space
326+
(or, to help avoid quoting issues, the special value `%20`).
327+
259328
### Gtest keywords
260329

261330
#### REPEAT
@@ -270,6 +339,12 @@ Additional options to the Gtest test framework.
270339

271340
Use `GTEST="OPTIONS=--help"` to see all available Gtest options.
272341

342+
#### AOT_MODULES
343+
344+
Generate AOT modules before testing for the specified module, or set of
345+
modules. If multiple modules are specified, they should be separated by space
346+
(or, to help avoid quoting issues, the special value `%20`).
347+
273348
### Microbenchmark keywords
274349

275350
#### FORK

make/Bundles.gmk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DOCS_TARGETS :=
3535
# On Windows tar frequently complains that "file changed as we read it" for
3636
# some random source files. This seems to be cause by anti virus scanners and
3737
# is most likely safe to ignore. When it happens, tar returns '1'.
38-
ifeq ($(OPENJDK_BUILD_OS), windows)
38+
ifeq ($(call isBuildOs, windows), true)
3939
TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
4040
endif
4141

@@ -144,7 +144,7 @@ endef
144144

145145
# On Macosx, we bundle up the macosx specific images which already have the
146146
# correct base directories.
147-
ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
147+
ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release)
148148
JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
149149
JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
150150
JDK_BUNDLE_SUBDIR :=
@@ -167,7 +167,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
167167

168168
# Create special filter rules when dealing with unzipped .dSYM directories on
169169
# macosx
170-
ifeq ($(OPENJDK_TARGET_OS), macosx)
170+
ifeq ($(call isTargetOs, macosx), true)
171171
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
172172
JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
173173
$(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))

make/CompileDemos.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/%
234234
$(call install-file)
235235
$(CHMOD) -f ug+w $@
236236

237-
ifeq ($(OPENJDK_TARGET_OS), solaris)
237+
ifeq ($(call isTargetOs, solaris), true)
238238
TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
239239
$(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
240240
$(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))

0 commit comments

Comments
 (0)