8307732: build-test-lib is broken

Reviewed-by: erikj, djelinski
This commit is contained in:
Johannes Bechberger 2023-05-10 12:13:22 +00:00 committed by Daniel Jeliński
parent 4aa65cbeef
commit 0da48f19cb
2 changed files with 9 additions and 3 deletions

View File

@ -36,7 +36,7 @@ TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
$(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \ $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \ TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/parser, \ SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
BIN := $(TEST_LIB_SUPPORT)/wb_classes, \ BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
JAR := $(TEST_LIB_SUPPORT)/wb.jar, \ JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
DISABLED_WARNINGS := deprecation removal preview, \ DISABLED_WARNINGS := deprecation removal preview, \
@ -53,7 +53,13 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \ HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \ JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview, \ DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview, \
JAVAC_FLAGS := --enable-preview, \ JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
--add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
--add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
--add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
--add-exports java.base/jdk.internal.classfile.java.lang.constant=ALL-UNNAMED \
--add-exports java.base/jdk.internal.module=ALL-UNNAMED \
--enable-preview, \
)) ))
TARGETS += $(BUILD_TEST_LIB_JAR) TARGETS += $(BUILD_TEST_LIB_JAR)

View File

@ -34,7 +34,7 @@ import java.util.Map;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
public class HttpHeaderParser { public final class HttpHeaderParser {
private static final char CR = '\r'; private static final char CR = '\r';
private static final char LF = '\n'; private static final char LF = '\n';
private static final char HT = '\t'; private static final char HT = '\t';