Skip to content

Commit 0da48f1

Browse files
parttimenerddjelinski
authored andcommittedMay 10, 2023
8307732: build-test-lib is broken
Reviewed-by: erikj, djelinski
1 parent 4aa65cb commit 0da48f1

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed
 

‎make/test/BuildTestLib.gmk

+8-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
3636

3737
$(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
3838
TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
39-
SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/parser, \
39+
SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
4040
BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
4141
JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
4242
DISABLED_WARNINGS := deprecation removal preview, \
@@ -53,7 +53,13 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
5353
HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
5454
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
5555
DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview, \
56-
JAVAC_FLAGS := --enable-preview, \
56+
JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
57+
--add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
58+
--add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
59+
--add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
60+
--add-exports java.base/jdk.internal.classfile.java.lang.constant=ALL-UNNAMED \
61+
--add-exports java.base/jdk.internal.module=ALL-UNNAMED \
62+
--enable-preview, \
5763
))
5864

5965
TARGETS += $(BUILD_TEST_LIB_JAR)

‎test/lib/jdk/test/lib/net/HttpHeaderParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import static java.util.Objects.requireNonNull;
3636

37-
public class HttpHeaderParser {
37+
public final class HttpHeaderParser {
3838
private static final char CR = '\r';
3939
private static final char LF = '\n';
4040
private static final char HT = '\t';

3 commit comments

Comments
 (3)

openjdk-notifier[bot] commented on May 10, 2023

@openjdk-notifier[bot]

vish-chan commented on Sep 27, 2023

@vish-chan
Contributor

/backport jdk17u-dev

openjdk[bot] commented on Sep 27, 2023

@openjdk[bot]

@vish-chan To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

Please sign in to comment.