From ad5b9c3da886f206542919cdd676f770687acc85 Mon Sep 17 00:00:00 2001 From: SendaoYan Date: Fri, 29 Aug 2025 16:20:08 +0000 Subject: [PATCH 1/2] 8353657: [8u] Test tools/launcher/VersionCheck.java fails with debug build --- jdk/test/tools/launcher/TestHelper.java | 3 ++- jdk/test/tools/launcher/VersionCheck.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jdk/test/tools/launcher/TestHelper.java b/jdk/test/tools/launcher/TestHelper.java index 40737320d52..f935d8e5051 100644 --- a/jdk/test/tools/launcher/TestHelper.java +++ b/jdk/test/tools/launcher/TestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -107,6 +107,7 @@ public class TestHelper { static final String CLASS_FILE_EXT = ".class"; static final String JAR_FILE_EXT = ".jar"; static final String EXE_FILE_EXT = ".exe"; + static final String DEBUGINFO_FILE_EXT = ".debuginfo"; static final String JLDEBUG_KEY = "_JAVA_LAUNCHER_DEBUG"; static final String EXPECTED_MARKER = "TRACER_MARKER:About to EXEC"; static final String TEST_PREFIX = "###TestError###: "; diff --git a/jdk/test/tools/launcher/VersionCheck.java b/jdk/test/tools/launcher/VersionCheck.java index c175e8dede7..8ff02e5efac 100644 --- a/jdk/test/tools/launcher/VersionCheck.java +++ b/jdk/test/tools/launcher/VersionCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -247,6 +247,9 @@ public boolean accept(File pathname) { if (isWindows && !name.endsWith(EXE_FILE_EXT)) { return false; } + if(name.endsWith(DEBUGINFO_FILE_EXT)) { + return false; + } for (String x : exclude) { if (name.endsWith(x)) { return false; From 847ec5465d73cd9680caa126c0c930fb0cff1ccd Mon Sep 17 00:00:00 2001 From: SendaoYan Date: Fri, 29 Aug 2025 16:24:20 +0000 Subject: [PATCH 2/2] Use NIX_DBGINFO_EXT instead of DEBUGINFO_FILE_EXT --- jdk/test/tools/launcher/TestHelper.java | 2 +- jdk/test/tools/launcher/VersionCheck.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/test/tools/launcher/TestHelper.java b/jdk/test/tools/launcher/TestHelper.java index f935d8e5051..8ea8a0c9343 100644 --- a/jdk/test/tools/launcher/TestHelper.java +++ b/jdk/test/tools/launcher/TestHelper.java @@ -107,7 +107,7 @@ public class TestHelper { static final String CLASS_FILE_EXT = ".class"; static final String JAR_FILE_EXT = ".jar"; static final String EXE_FILE_EXT = ".exe"; - static final String DEBUGINFO_FILE_EXT = ".debuginfo"; + static final String NIX_DBGINFO_EXT = ".debuginfo"; static final String JLDEBUG_KEY = "_JAVA_LAUNCHER_DEBUG"; static final String EXPECTED_MARKER = "TRACER_MARKER:About to EXEC"; static final String TEST_PREFIX = "###TestError###: "; diff --git a/jdk/test/tools/launcher/VersionCheck.java b/jdk/test/tools/launcher/VersionCheck.java index 8ff02e5efac..a355a1f50a4 100644 --- a/jdk/test/tools/launcher/VersionCheck.java +++ b/jdk/test/tools/launcher/VersionCheck.java @@ -247,7 +247,7 @@ public boolean accept(File pathname) { if (isWindows && !name.endsWith(EXE_FILE_EXT)) { return false; } - if(name.endsWith(DEBUGINFO_FILE_EXT)) { + if(name.endsWith(NIX_DBGINFO_EXT)) { return false; } for (String x : exclude) {