Unverified Commit 9ded4656 authored by Sean Gilligan's avatar Sean Gilligan Committed by GitHub
Browse files

Use pass thru.tests.version not custom installCheckPhase script

parent 02f7ac63
Loading
Loading
Loading
Loading
+5 −12
Original line number Diff line number Diff line
@@ -141,18 +141,11 @@ let
        fi
      '';

    doInstallCheck = true;
    installCheckPhase = ''
      echo "Checking 'java -version' output contains ${dist.jdkVersion}, 'OpenJDK', and 'Zulu'"
      output=`$out/bin/java -version 2>&1`
      # Our Zulu 23 package is a special case (and should be deleted as it is End-of-Life)
      expected_version=$(if [[ "${dist.jdkVersion}" == 23* ]]; then echo 23; else echo "${dist.jdkVersion}"; fi)
      echo "Output is: $output"
      echo "$output" | grep -q "$expected_version"
      echo "$output" | grep -q "OpenJDK"
      echo "$output" | grep -q "Zulu"
    '';

  passthru.tests.version = testers.testVersion {
    package = jdk;
    command = "java -version";
    version = ''openjdk version "${if lib.versions.major version == "23" then "23" else version}"'';
  };
    preFixup =
      ''
        # Propagate the setJavaClassPath setup hook from the ${if isJdk8 then "JRE" else "JDK"} so that