-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a check for the minimal GraalVM version
This commit adds a new Gradle and Maven requiredVersion configuration option that specifies the minimal GraalVM version and can be set to MAJOR, MAJOR.MINOR or MAJOR.MINOR.PATCH. Closes gh-346
- Loading branch information
Showing
12 changed files
with
349 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
common/utils/src/test/java/org/graalvm/buildtools/utils/NativeImageUtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
/* | ||
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* The Universal Permissive License (UPL), Version 1.0 | ||
* | ||
* Subject to the condition set forth below, permission is hereby granted to any | ||
* person obtaining a copy of this software, associated documentation and/or | ||
* data (collectively the "Software"), free of charge and under any and all | ||
* copyright rights in the Software, and any and all patent rights owned or | ||
* freely licensable by each licensor hereunder covering either (i) the | ||
* unmodified Software as contributed to or provided by such licensor, or (ii) | ||
* the Larger Works (as defined below), to deal in both | ||
* | ||
* (a) the Software, and | ||
* | ||
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if | ||
* one is included with the Software each a "Larger Work" to which the Software | ||
* is contributed by such licensors), | ||
* | ||
* without restriction, including without limitation the rights to copy, create | ||
* derivative works of, display, perform, and distribute the Software and make, | ||
* use, sell, offer for sale, import, export, have made, and have sold the | ||
* Software and the Larger Work(s), and to sublicense the foregoing rights on | ||
* either these or other terms. | ||
* | ||
* This license is subject to the following condition: | ||
* | ||
* The above copyright notice and either this complete permission notice or at a | ||
* minimum a reference to the UPL must be included in all copies or substantial | ||
* portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
package org.graalvm.buildtools.utils; | ||
|
||
import org.junit.jupiter.api.Assertions; | ||
import org.junit.jupiter.api.Test; | ||
|
||
class NativeImageUtilsTest { | ||
|
||
@Test | ||
void invalidVersionToCheck() { | ||
Assertions.assertThrows(IllegalArgumentException.class, () -> | ||
NativeImageUtils.checkVersion("22.3", "invalid")); | ||
Assertions.assertThrows(IllegalArgumentException.class, () -> | ||
NativeImageUtils.checkVersion("22.3", "GraalVM")); | ||
} | ||
|
||
@Test | ||
void invalidRequiredVersion() { | ||
Assertions.assertThrows(IllegalArgumentException.class, () -> | ||
NativeImageUtils.checkVersion("invalid", "GraalVM 22.3.0")); | ||
Assertions.assertThrows(IllegalArgumentException.class, () -> | ||
NativeImageUtils.checkVersion("22.3.0-dev", "GraalVM 22.3.0")); | ||
} | ||
|
||
@Test | ||
void checkGraalVMCEVersion() { | ||
NativeImageUtils.checkVersion("22", "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)"); | ||
NativeImageUtils.checkVersion("22.3", "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)"); | ||
NativeImageUtils.checkVersion("22.3.0", "GraalVM 22.3.0 Java 17 CE (Java Version 17.0.5+8-jvmci-22.3-b08)"); | ||
} | ||
|
||
@Test | ||
void checkGraalVMCEDevVersion() { | ||
NativeImageUtils.checkVersion("22", "GraalVM 22.3.0-dev Java 17 CE (Java Version 17.0.5+8-LTS)"); | ||
NativeImageUtils.checkVersion("22.3", "GraalVM 22.3.0-dev Java 17 CE (Java Version 17.0.5+8-LTS)"); | ||
NativeImageUtils.checkVersion("22.3.0", "GraalVM 22.3.0-dev Java 17 CE (Java Version 17.0.5+8-LTS)"); | ||
} | ||
|
||
@Test | ||
void checkGraalVMEEVersion() { | ||
NativeImageUtils.checkVersion("22", "GraalVM 22.3.0 Java 17 EE (Java Version 17.0.5+9-LTS-jvmci-22.3-b07)"); | ||
NativeImageUtils.checkVersion("22.3", "GraalVM 22.3.0 Java 17 EE (Java Version 17.0.5+9-LTS-jvmci-22.3-b07)"); | ||
NativeImageUtils.checkVersion("22.3.0", "GraalVM 22.3.0 Java 17 EE (Java Version 17.0.5+9-LTS-jvmci-22.3-b07)"); | ||
} | ||
|
||
@Test | ||
void checkGreaterVersion() { | ||
NativeImageUtils.checkVersion("22", "GraalVM 23.2.1"); | ||
NativeImageUtils.checkVersion("23.1", "GraalVM 23.2.1"); | ||
NativeImageUtils.checkVersion("23.2.0", "GraalVM 23.2.1"); | ||
} | ||
|
||
@Test | ||
void checkLowerVersion() { | ||
Assertions.assertThrows(IllegalStateException.class, () -> | ||
NativeImageUtils.checkVersion("23", "GraalVM 22.2.1") | ||
); | ||
Assertions.assertThrows(IllegalStateException.class, () -> | ||
NativeImageUtils.checkVersion("22.3", "GraalVM 22.2.1") | ||
); | ||
Assertions.assertThrows(IllegalStateException.class, () -> | ||
NativeImageUtils.checkVersion("22.2.2", "GraalVM 22.2.1") | ||
); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/RequiredVersionTest.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package org.graalvm.buildtools.gradle; | ||
|
||
import org.graalvm.buildtools.gradle.fixtures.AbstractFunctionalTest; | ||
|
||
class RequiredVersionTest extends AbstractFunctionalTest { | ||
|
||
def "can build a native image with a valid required version"() { | ||
def nativeApp = file("build/native/nativeCompile/java-application") | ||
|
||
given: | ||
withSample("java-application") | ||
|
||
buildFile << """ | ||
graalvmNative.binaries.all { | ||
requiredVersion = '22.2' | ||
} | ||
""".stripIndent() | ||
|
||
when: | ||
run 'nativeCompile' | ||
|
||
then: | ||
tasks { | ||
succeeded ':jar', ':nativeCompile' | ||
doesNotContain ':build', ':run' | ||
} | ||
|
||
and: | ||
nativeApp.exists() | ||
} | ||
|
||
def "can't build a native image with an invalid required version"() { | ||
given: | ||
withSample("java-application") | ||
|
||
buildFile << """ | ||
graalvmNative.binaries.all { | ||
requiredVersion = '100' | ||
} | ||
""".stripIndent() | ||
|
||
when: | ||
fails 'nativeCompile' | ||
|
||
then: | ||
errorOutputContains "GraalVM version 100 is required but 22 has been detected, please upgrade." | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.