From e9901dcd3acd5ce5403805324dde2291a0f13fa7 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 27 Feb 2025 15:04:07 -0800
Subject: [PATCH 1/4] Better benchmark-overhead test logging, part 2

---
 .github/workflows/build-common.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index c009bb58399a..59c20b40fafc 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -415,7 +415,7 @@ jobs:
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Test
-        run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Upload jvm crash dump files if any
         if: failure()
@@ -489,13 +489,17 @@ jobs:
         working-directory: gradle-plugins
 
       - name: Build distro
-        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
         working-directory: examples/distro
 
       - name: Build extension
-        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
         working-directory: examples/extension
 
+      - name: Build benchmark-overhead
+        run: ./gradlew build ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        working-directory: benchmark-overhead
+
       - name: Run muzzle check against extension
         run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
         working-directory: examples/extension

From 80793bc91a9c3506e4b8aa76537ad89a86248519 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 27 Feb 2025 20:11:43 -0800
Subject: [PATCH 2/4] import

---
 benchmark-overhead/build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
index d3c8713dee60..0a72569eb09c 100644
--- a/benchmark-overhead/build.gradle.kts
+++ b/benchmark-overhead/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
 plugins {
   id("java")
   id("com.diffplug.spotless") version "7.0.2"

From ab4e53839d28b478b2a86a35a172ea001d7c7731 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 27 Feb 2025 20:48:30 -0800
Subject: [PATCH 3/4] fix

---
 .github/workflows/build-common.yml  | 2 +-
 benchmark-overhead/build.gradle.kts | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 59c20b40fafc..d3636dd08073 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -497,7 +497,7 @@ jobs:
         working-directory: examples/extension
 
       - name: Build benchmark-overhead
-        run: ./gradlew build ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+        run: ./gradlew assemble ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
         working-directory: benchmark-overhead
 
       - name: Run muzzle check against extension
diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
index 0a72569eb09c..ab5817f33834 100644
--- a/benchmark-overhead/build.gradle.kts
+++ b/benchmark-overhead/build.gradle.kts
@@ -30,14 +30,11 @@ dependencies {
   testImplementation("org.slf4j:slf4j-simple:2.0.17")
 
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks {
   test {
     useJUnitPlatform()
-    testLogging {
-      exceptionFormat = TestExceptionFormat.FULL
-      showStandardStreams = true
-    }
   }
 }

From d917733b6ba581f9d9155f2bb6633a1e8d3fe5c0 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 27 Feb 2025 20:49:18 -0800
Subject: [PATCH 4/4] fix

---
 benchmark-overhead/build.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
index ab5817f33834..d374f5011939 100644
--- a/benchmark-overhead/build.gradle.kts
+++ b/benchmark-overhead/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-
 plugins {
   id("java")
   id("com.diffplug.spotless") version "7.0.2"