From 8402260535eae0fb8bca2327372d03e33cc2add9 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 12 Oct 2022 13:34:07 +0000 Subject: [PATCH] 8295198: Update more openjdk.java.net => openjdk.org URLs Reviewed-by: erikj --- ASSEMBLY_EXCEPTION | 6 +++--- CONTRIBUTING.md | 2 +- doc/hotspot-unit-tests.html | 4 ++-- doc/hotspot-unit-tests.md | 4 ++-- make/common/ProcessMarkdown.gmk | 2 +- src/java.base/share/man/java.1 | 11 +++++------ 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ASSEMBLY_EXCEPTION b/ASSEMBLY_EXCEPTION index 065b8d90239..429666664e9 100644 --- a/ASSEMBLY_EXCEPTION +++ b/ASSEMBLY_EXCEPTION @@ -2,8 +2,8 @@ OPENJDK ASSEMBLY EXCEPTION The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 +openjdk.org ("OpenJDK Code") is distributed under the terms of the GNU +General Public License version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code @@ -12,7 +12,7 @@ only ("GPL2"), with the following clarification and special exception. As a special exception, Oracle gives you permission to link this OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html + https://openjdk.org/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c769d7565e..990ed2b79ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contributing to the JDK -Please see for how to contribute. +Please see for how to contribute. diff --git a/doc/hotspot-unit-tests.html b/doc/hotspot-unit-tests.html index fe6eb678527..b90fe018563 100644 --- a/doc/hotspot-unit-tests.html +++ b/doc/hotspot-unit-tests.html @@ -115,7 +115,7 @@

However in some cases, default information is not enough, a commonly used example is an assert inside a loop, GoogleTest will not print iteration values (unless it is an assert's parameter). Other demonstrative examples are printing error code and a corresponding error message; printing internal states which might have an impact on results. One should add this information to assert message using << operator.

Uncluttered output

Print information only if it is needed.

-

Too verbose tests which print all information even if they pass are very bad practice. They just pollute output, so it becomes harder to find useful information. In order not print information till it is really needed, one should consider saving it to a temporary buffer and pass to an assert. https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp has a good example how to do that.

+

Too verbose tests which print all information even if they pass are very bad practice. They just pollute output, so it becomes harder to find useful information. In order not print information till it is really needed, one should consider saving it to a temporary buffer and pass to an assert. https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp has a good example how to do that.

Failures propagation

Wrap a subroutine call into EXPECT_NO_FATAL_FAILURE macro to propagate failures.

ASSERT and FAIL abort only the current function, so if you have them in a subroutine, a test will not be aborted after the subroutine even if ASSERT or FAIL fails. You should call such subroutines in ASSERT_NO_FATAL_FAILURE macro to propagate fatal failures and abort a test. (EXPECT|ASSERT)_NO_FATAL_FAILURE can also be used to provide more information.

@@ -171,7 +171,7 @@

Test-specific flags

Passing flags to a tested JVM in TEST_OTHER_VM and TEST_VM_ASSERT* should be possible, but is not implemented yet.

Facility to pass test-specific flags is needed for system, regression or other types of tests which require a fully initialized JVM in some particular configuration, e.g. with Serial GC selected. There is no support for such tests now, however, there is a plan to add that in upcoming releases.

-

For now, if a test depends on flags values, it should have if (!<flag>) { return } guards in the very beginning and @requires comment similar to jtreg @requires directive right before test macros. https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp ha an example of this temporary workaround. It is important to follow that pattern as it allows us to easily find all such tests and update them as soon as there is an implementation of flag passing facility.

+

For now, if a test depends on flags values, it should have if (!<flag>) { return } guards in the very beginning and @requires comment similar to jtreg @requires directive right before test macros. https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp ha an example of this temporary workaround. It is important to follow that pattern as it allows us to easily find all such tests and update them as soon as there is an implementation of flag passing facility.

In long-term, we expect jtreg to support GoogleTest tests as first class citizens, that is to say, jtreg will parse @requires comments and filter out inapplicable tests.

Flag restoring

Restore changed flags.

diff --git a/doc/hotspot-unit-tests.md b/doc/hotspot-unit-tests.md index bcc95185c0b..62ace4ef6ee 100644 --- a/doc/hotspot-unit-tests.md +++ b/doc/hotspot-unit-tests.md @@ -194,7 +194,7 @@ very bad practice. They just pollute output, so it becomes harder to find useful information. In order not print information till it is really needed, one should consider saving it to a temporary buffer and pass to an assert. - + has a good example how to do that. ### Failures propagation @@ -383,7 +383,7 @@ upcoming releases. For now, if a test depends on flags values, it should have `if (!) { return }` guards in the very beginning and `@requires` comment similar to jtreg `@requires` directive right before test macros. - + ha an example of this temporary workaround. It is important to follow that pattern as it allows us to easily find all such tests and update them as soon as there is an implementation of flag passing facility. diff --git a/make/common/ProcessMarkdown.gmk b/make/common/ProcessMarkdown.gmk index fff54d16238..671d8206311 100644 --- a/make/common/ProcessMarkdown.gmk +++ b/make/common/ProcessMarkdown.gmk @@ -57,7 +57,7 @@ define ProcessMarkdown endif ifneq ($$($1_CSS), ) - ifneq ($$(findstring http:/, $$($1_CSS)), ) + ifneq ($$(findstring https:/, $$($1_CSS)), ) $1_$2_CSS_OPTION := --css '$$($1_CSS)' else $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR))) diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1 index 941d185d343..d0268e474ff 100644 --- a/src/java.base/share/man/java.1 +++ b/src/java.base/share/man/java.1 @@ -300,7 +300,7 @@ It is an error if there is a class on the application class path whose name is the same as that of the class to be executed. .PP See \f[B]JEP 330: Launch Single\-File Source\-Code Programs\f[R] -[http://openjdk.java.net/jeps/330] for complete details. +[https://openjdk.org/jeps/330] for complete details. .SH USING THE JDK_JAVA_OPTIONS LAUNCHER ENVIRONMENT VARIABLE .PP \f[CB]JDK_JAVA_OPTIONS\f[R] prepends its content to the options parsed @@ -4111,11 +4111,10 @@ warning is issued when they\[aq]re used. .TP .B \f[CB]\-\-illegal\-access=\f[R]\f[I]parameter\f[R] Controlled \f[I]relaxed strong encapsulation\f[R], as defined in \f[B]JEP -261\f[R] -[https://openjdk.java.net/jeps/261#Relaxed\-strong\-encapsulation]. +261\f[R] [https://openjdk.org/jeps/261#Relaxed\-strong\-encapsulation]. This option was deprecated in JDK 16 by \f[B]JEP 396\f[R] -[https://openjdk.java.net/jeps/396] and made obsolete in JDK 17 by -\f[B]JEP 403\f[R] [https://openjdk.java.net/jeps/403]. +[https://openjdk.org/jeps/396] and made obsolete in JDK 17 by \f[B]JEP +403\f[R] [https://openjdk.org/jeps/403]. .RS .RE .TP @@ -4392,7 +4391,7 @@ start the VM with the command line option: .RE .PP See \f[B]CodeHeap State Analytics (OpenJDK)\f[R] -[https://bugs.openjdk.java.net/secure/attachment/75649/JVM_CodeHeap_StateAnalytics_V2.pdf] +[https://bugs.openjdk.org/secure/attachment/75649/JVM_CodeHeap_StateAnalytics_V2.pdf] for a detailed description of the code heap state analytics feature, the supported functions, and the granularity options. .SH ENABLE LOGGING WITH THE JVM UNIFIED LOGGING FRAMEWORK