From d6a88011115174465e4d78ae307903483b5d34f5 Mon Sep 17 00:00:00 2001
From: Sam Gammon <sam@elide.dev>
Date: Thu, 30 Jan 2025 19:16:34 -0800
Subject: [PATCH] fix: server tests on jdk17

Signed-off-by: Sam Gammon <sam@elide.dev>
---
 pkl-server/pkl-server.gradle.kts               |  4 ----
 .../org/pkl/server/AbstractServerTest.kt       | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkl-server/pkl-server.gradle.kts b/pkl-server/pkl-server.gradle.kts
index 66a91ba89..7bbd426f9 100644
--- a/pkl-server/pkl-server.gradle.kts
+++ b/pkl-server/pkl-server.gradle.kts
@@ -108,7 +108,3 @@ testNative {
   }
 }
 
-tasks.withType(Test::class).configureEach {
-  // Disable multi-JDK testing for pkl-server.
-  enabled = !name.lowercase().contains("jdk")
-}
diff --git a/pkl-server/src/test/kotlin/org/pkl/server/AbstractServerTest.kt b/pkl-server/src/test/kotlin/org/pkl/server/AbstractServerTest.kt
index 00a7ab513..05eb94fbc 100644
--- a/pkl-server/src/test/kotlin/org/pkl/server/AbstractServerTest.kt
+++ b/pkl-server/src/test/kotlin/org/pkl/server/AbstractServerTest.kt
@@ -25,6 +25,7 @@ import kotlin.io.path.outputStream
 import kotlin.io.path.writeText
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
@@ -38,13 +39,18 @@ abstract class AbstractServerTest {
   companion object {
     /** Set to `true` to bypass messagepack serialization when running [JvmServerTest]. */
     internal const val USE_DIRECT_TRANSPORT = false
+    lateinit var executor: ExecutorService
 
-    val executor: ExecutorService =
-      if (USE_DIRECT_TRANSPORT) {
-        createDirectExecutor()
-      } else {
-        Executors.newCachedThreadPool()
-      }
+    @BeforeAll
+    @JvmStatic
+    fun beforeAll() {
+      executor =
+        if (USE_DIRECT_TRANSPORT) {
+          createDirectExecutor()
+        } else {
+          Executors.newCachedThreadPool()
+        }
+    }
 
     @AfterAll
     @JvmStatic