Unverified Commit e700287f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #299046 from ShamrockLee/jre-minimal-fix 

jre_minimal: convert `passthru.tests` to an attribute set and fix pre/post hook running
parents 3863a5e6 6a4cf944

pkgs/development/compilers/openjdk/jre.nix

+4 −4
Original line number Diff line number Diff line
@@ -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

pkgs/development/compilers/openjdk/tests/hello-logging.nix

+4 −4
Original line number Diff line number Diff line
@@ -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

    '';

  }

pkgs/development/compilers/openjdk/tests/hello.nix

+4 −4
Original line number Diff line number Diff line
@@ -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

    '';

  }