Skip to content

Commit 959827f

Browse files
committed
[GR-64969] Fix maven tests with longer version string.
PullRequest: graalpython/3793
2 parents 56ea39a + ff91c94 commit 959827f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

graalpython/com.oracle.graal.python.test/src/tests/standalone/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ def print_missing_graalpy_msg(graalpy_home=None):
258258
sep="\n")
259259

260260
def get_graalvm_version():
261-
graalvmVersion, _ = run_cmd([get_gp(), "-c", "print(__graalpython__.get_graalvm_version(), end='')"], os.environ.copy())
261+
if not (graalvmVersion := os.environ.get("GRAAL_VERSION")):
262+
graalvmVersion, _ = run_cmd([get_gp(), "-c", "print(__graalpython__.get_graalvm_version(), end='')"], os.environ.copy())
262263
# when JLine is cannot detect a terminal, it prints logging info
263264
graalvmVersion = graalvmVersion.split("\n")[-1]
264265
# we never test -dev versions here, we always pretend to use release versions

mx.graalpython/mx_graalpython.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ def get_boolean_env(name, default=False):
9595
SUITE_COMPILER = mx.suite("compiler", fatalIfMissing=False)
9696

9797
GRAAL_VERSION = SUITE.suiteDict['version']
98+
IS_RELEASE = SUITE.suiteDict['release']
9899
GRAAL_VERSION_MAJ_MIN = ".".join(GRAAL_VERSION.split(".")[:2])
99100
PYTHON_VERSION = SUITE.suiteDict[f'{SUITE.name}:pythonVersion']
100101
PYTHON_VERSION_MAJ_MIN = ".".join(PYTHON_VERSION.split('.')[:2])
@@ -1088,6 +1089,9 @@ def setup_graalpy_plugin_tests():
10881089

10891090
env['JAVA_HOME'] = gvm_jdk
10901091
env['PYTHON_STANDALONE_HOME'] = standalone_home
1092+
env['GRAAL_VERSION'] = GRAAL_VERSION
1093+
if not IS_RELEASE:
1094+
env['GRAAL_VERSION'] += '-dev'
10911095

10921096
# setup maven downloader overrides
10931097
env['MAVEN_REPO_OVERRIDE'] = ",".join([

0 commit comments

Comments
 (0)