Skip to content

Commit 1258a82

Browse files
otethaltimfel
authored andcommitted
Fix path separator and disable polyglot_app test on Windows
(cherry picked from commit 02e6319)
1 parent 8c0b12a commit 1258a82

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_standalone.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import tempfile
4343
import unittest
4444
import shutil
45+
import sys
4546

4647
is_enabled = 'ENABLE_STANDALONE_UNITTESTS' in os.environ and os.environ['ENABLE_STANDALONE_UNITTESTS'] == "true"
4748
MVN_CMD = [shutil.which('mvn')]
@@ -96,6 +97,7 @@ def get_gp():
9697
return graalpy
9798

9899
@unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
100+
@unittest.skipUnless(sys.platform != 'win32', 'not supported on Windows')
99101
def test_polyglot_app():
100102

101103
graalpy = get_gp()

graalpython/lib-graalpython/modules/standalone/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ def build_binary(self, ni, jc):
473473
print(p.stderr.decode())
474474
exit(1)
475475

476-
ni_modules = ":".join([os.path.join(self.modules_path, f) for f in os.listdir(self.modules_path) if f.endswith(".jar")] + [self.target_dir])
476+
ni_modules = os.pathsep.join([os.path.join(self.modules_path, f) for f in os.listdir(self.modules_path) if f.endswith(".jar")] + [self.target_dir])
477477
cmd = [ni, "--module-path", ni_modules] + self.parsed_args.ni_args[:]
478478

479479
if self.parsed_args.Os:

0 commit comments

Comments
 (0)