gradle: fix toolchains test (#403620)

2025-05-03 08:47:05 +02:00
parent bbe4c49aee 7754699a8f
commit ea24f23ff5
1 changed files with 8 additions and 3 deletions
@@ -286,7 +286,8 @@ rec {
            tests = {
              toolchains =
                let
-                  javaVersion = lib.versions.major (lib.getVersion jdk23);
+                  javaVersion = lib.getVersion jdk23;
+                  javaMajorVersion = lib.versions.major javaVersion;
                in
                runCommand "detects-toolchains-from-nix-env"
                  {
@@ -302,10 +303,14 @@ rec {
                  }
                  ''
                    cp -a $src/* .
-                    substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaVersion}'
+                    substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
                    env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
                    gradle run --no-daemon --quiet --console plain > $out
-                    test "$(<$out)" = "${javaVersion}"
+                    actual="$(<$out)"
+                    if [[ "${javaVersion}" != "$actual"* ]]; then
+                      echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                      exit 1
+                    fi
                  '';
            } // gradle.tests;
          }