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 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 ''; }