From db25698843caa07978c198eac5a0bcc3c5d559b7 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 26 Mar 2024 04:54:05 +0800
Subject: [PATCH 1/2] jre_miniman.tests: fix pre/post hook running

---
 .../development/compilers/openjdk/tests/hello-logging.nix | 8 ++++----
 pkgs/development/compilers/openjdk/tests/hello.nix        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/tests/hello-logging.nix b/pkgs/development/compilers/openjdk/tests/hello-logging.nix
index 71f3a5543f7c..20fbb93ae2be 100644
--- a/pkgs/development/compilers/openjdk/tests/hello-logging.nix
+++ b/pkgs/development/compilers/openjdk/tests/hello-logging.nix
@@ -25,12 +25,12 @@ in
     src = source;
 
     buildPhase = ''
-      runHook preBuildPhase
+      runHook preBuild
       ${jdk}/bin/javac src/Hello.java
-      runHook postBuildPhase
+      runHook postBuild
     '';
     installPhase = ''
-      runHook preInstallPhase
+      runHook preInstall
 
       mkdir -p $out/lib
       cp src/Hello.class $out/lib
@@ -42,6 +42,6 @@ in
       EOF
       chmod a+x $out/bin/hello
 
-      runHook postInstallPhase
+      runHook postInstall
     '';
   }
diff --git a/pkgs/development/compilers/openjdk/tests/hello.nix b/pkgs/development/compilers/openjdk/tests/hello.nix
index bc5be4a9e9a9..d55a71eb6659 100644
--- a/pkgs/development/compilers/openjdk/tests/hello.nix
+++ b/pkgs/development/compilers/openjdk/tests/hello.nix
@@ -20,12 +20,12 @@ in
     src = source;
 
     buildPhase = ''
-      runHook preBuildPhase
+      runHook preBuild
       ${jdk}/bin/javac src/Hello.java
-      runHook postBuildPhase
+      runHook postBuild
     '';
     installPhase = ''
-      runHook preInstallPhase
+      runHook preInstall
 
       mkdir -p $out/lib
       cp src/Hello.class $out/lib
@@ -37,6 +37,6 @@ in
       EOF
       chmod a+x $out/bin/hello
 
-      runHook postInstallPhase
+      runHook postInstall
     '';
   }

From 6a4cf944ef840faf63efd4b699b46e6ef60c013a Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 26 Mar 2024 06:50:18 +0800
Subject: [PATCH 2/2] jre_minimal.tests: convert to an attribute set

Provide package tests as an attribute set instead of a list, making it
easier to build individual test cases.
---
 pkgs/development/compilers/openjdk/jre.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix
index 02f6da928cdd..da3bd16bcb54 100644
--- a/pkgs/development/compilers/openjdk/jre.nix
+++ b/pkgs/development/compilers/openjdk/jre.nix
@@ -30,10 +30,10 @@ let
 
     passthru = {
       home = "${jre}";
-      tests = [
-        (callPackage ./tests/test_jre_minimal.nix {})
-        (callPackage ./tests/test_jre_minimal_with_logging.nix {})
-      ];
+      tests = {
+        jre_minimal-hello = callPackage ./tests/test_jre_minimal.nix {};
+        jre_minimal-hello-logging = callPackage ./tests/test_jre_minimal_with_logging.nix {};
+      };
     };
   };
 in jre