Skip to content

Commit bfbac6e

Browse files
[GR-18389] Update to new language home property.
PullRequest: graalpython/831
2 parents 03eedd0 + 211a78f commit bfbac6e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.
@@ -69,7 +69,7 @@ public class PythonTests {
6969
try {
7070
openConnection = JavaInteropTest.class.getProtectionDomain().getCodeSource().getLocation().openConnection();
7171
if (!(openConnection instanceof JarURLConnection)) {
72-
System.setProperty("python.home", GraalPythonEnvVars.graalpythonHome());
72+
System.setProperty("org.graalvm.language.python.home", GraalPythonEnvVars.graalpythonHome());
7373
}
7474
} catch (IOException e) {
7575
}

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/ParserTestBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -302,7 +302,7 @@ public static String readFile(File f) throws IOException {
302302
}
303303

304304
public File getTestFilesDir() {
305-
String dataDirPath = System.getProperty("python.home");
305+
String dataDirPath = System.getProperty("org.graalvm.language.python.home");
306306
dataDirPath += "/com.oracle.graal.python.test/testData/testFiles";
307307
File dataDir = new File(dataDirPath);
308308
assertTrue("The test files folder, was not found.", dataDir.exists());
@@ -320,7 +320,7 @@ public File getTestFileFromTestAndTestMethod() {
320320
}
321321

322322
public File getGoldenDataDir() {
323-
String dataDirPath = System.getProperty("python.home");
323+
String dataDirPath = System.getProperty("org.graalvm.language.python.home");
324324
dataDirPath += "/com.oracle.graal.python.test/testData/goldenFiles";
325325
File dataDir = new File(dataDirPath);
326326
assertTrue("The golden files folder, was not found.", dataDir.exists());

mx.graalpython/mx_graalpython_benchmark.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
1+
# Copyright (c) 2018, 2020, Oracle and/or its affiliates.
22
# Copyright (c) 2013, Regents of the University of California
33
#
44
# All rights reserved.
@@ -298,7 +298,7 @@ def run(self, cwd, args):
298298
if isinstance(self._extra_vm_args, list):
299299
vm_args += self._extra_vm_args
300300
vm_args += [
301-
"-Dpython.home=%s" % join(SUITE.dir, "graalpython"),
301+
"-Dorg.graalvm.language.python.home=%s" % join(SUITE.dir, "graalpython"),
302302
"com.oracle.graal.python.shell.GraalPythonMain"
303303
]
304304
for a in args[:]:

mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
},
4545
{
4646
"name": "sulong",
47-
"version": "1f7bf0731dcb4845afeff79dfb67d4531a96651a",
47+
"version": "7bdfd6c9b5dbe1a85cf6fcedbae6ccd08a6caeb6",
4848
"subdir": True,
4949
"urls": [
5050
{"url": "https://github.com/oracle/graal", "kind": "git"},
5151
]
5252
},
5353
{
5454
"name": "regex",
55-
"version": "1f7bf0731dcb4845afeff79dfb67d4531a96651a",
55+
"version": "7bdfd6c9b5dbe1a85cf6fcedbae6ccd08a6caeb6",
5656
"subdir": True,
5757
"urls": [
5858
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)