From e62b8692d30d83f294ecdd5e2f01d61972945a6a Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Fri, 25 Apr 2025 19:14:38 +0100
Subject: [PATCH] Fix DebugLineNumbersTest and run it on extended test runs.
 (#1294)

---
 .github/workflows/test-push.yml                             | 1 +
 build.gradle                                                | 3 ++-
 gradle/test.libs.versions.toml                              | 2 +-
 .../loom/test/integration/DebugLineNumbersTest.groovy       | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml
index 82fe3328..636bfd7e 100644
--- a/.github/workflows/test-push.yml
+++ b/.github/workflows/test-push.yml
@@ -86,6 +86,7 @@ jobs:
       - run: ./gradlew printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
         env:
           TEST_WARNING_MODE: fail
+          EXTENDED_TESTS: ${{ github.event.inputs.extended_tests }}
         id: test
 
       - uses: actions/upload-artifact@v4
diff --git a/build.gradle b/build.gradle
index 777dd96c..479fe1a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -336,6 +336,7 @@ publishing {
 tasks.register('writeActionsTestMatrix') {
 	doLast {
 		def testMatrix = []
+		def extendedTests = Boolean.parseBoolean(System.getenv('EXTENDED_TESTS') ?: 'false')
 		file('src/test/groovy/net/fabricmc/loom/test/integration').eachFile {
 			if (it.name.endsWith("Test.groovy")) {
 				if (it.name.endsWith("ReproducibleBuildTest.groovy")) {
@@ -343,7 +344,7 @@ tasks.register('writeActionsTestMatrix') {
 					return
 				}
 
-				if (it.name.endsWith("DebugLineNumbersTest.groovy")) {
+				if (it.name.endsWith("DebugLineNumbersTest.groovy") && !extendedTests) {
 					// Known flakey test
 					return
 				}
diff --git a/gradle/test.libs.versions.toml b/gradle/test.libs.versions.toml
index ee687b4e..ba15a859 100644
--- a/gradle/test.libs.versions.toml
+++ b/gradle/test.libs.versions.toml
@@ -3,7 +3,7 @@ spock = "2.3-groovy-3.0"
 junit = "5.12.2"
 javalin = "6.6.0"
 mockito = "5.17.0"
-java-debug = "0.52.0"
+java-debug = "0.53.1"
 mixin = "0.15.3+mixin.0.8.7"
 bouncycastle = "1.80"
 
diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/DebugLineNumbersTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/DebugLineNumbersTest.groovy
index 52824211..8d8dd444 100644
--- a/src/test/groovy/net/fabricmc/loom/test/integration/DebugLineNumbersTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/integration/DebugLineNumbersTest.groovy
@@ -52,9 +52,9 @@ import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 class DebugLineNumbersTest extends Specification implements GradleProjectTestTrait {
 	static final String MAPPINGS = "1.20.1-net.fabricmc.yarn.1_20_1.1.20.1+build.1-v2"
 	static final Map<String, Integer> BREAKPOINTS = [
-		"net.minecraft.server.dedicated.ServerPropertiesLoader": 16,
-		"net.minecraft.server.dedicated.MinecraftDedicatedServer": 107,
-		"net.minecraft.registry.RegistryOps": 67
+		"net.minecraft.server.dedicated.ServerPropertiesLoader": 12,
+		"net.minecraft.server.dedicated.MinecraftDedicatedServer": 105,
+		"net.minecraft.registry.RegistryOps": 44
 	]
 
 	def "Debug test"() {