Skip to content

Commit 34584e4

Browse files
committed
Support C ext copying on linux only for now
1 parent 9a1b2c9 commit 34584e4

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/copying/MachOFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void write(TruffleFile copy) throws IOException, InterruptedException {
151151
}
152152
assert buffer.position() == MachOHeader.SIZE64 + mh.sizeOfCmds;
153153
for (int i = 0; i < emptySpace; i++) {
154-
buffer.put((byte)0);
154+
buffer.put((byte) 0);
155155
}
156156

157157
try (var os = copy.newOutputStream(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {

mx.graalpython/mx_graalpython.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,17 @@ def __str__(self):
407407
configs += [
408408
TestConfig("junit", vm_args + graalpy_tests + args, True),
409409
TestConfig("junit", vm_args + graalpy_tests + args, False),
410-
# MultiContext cext tests should run by themselves so they aren't influenced by others
411-
TestConfig("multi-cext", vm_args + ['org.graalvm.python.embedding.cext.test'] + args + (["--use-graalvm"] if has_compiler else []), True),
412410
# TCK suite is not compatible with the PythonMxUnittestConfig,
413411
# so it must have its own run and the useResources config is ignored
414412
TestConfig("tck", vm_args + ['com.oracle.truffle.tck.tests'] + args, False),
415413
]
414+
if mx.is_linux():
415+
# see GR-60656 and GR-60658 for what's missing in darwin and windows support
416+
configs.append(
417+
# MultiContext cext tests should run by themselves so they aren't influenced by others
418+
TestConfig("multi-cext", vm_args + ['org.graalvm.python.embedding.cext.test'] + args + (["--use-graalvm"] if has_compiler else []), True),
419+
)
420+
416421
if '--regex' not in args:
417422
async_regex = ['--regex', r'com\.oracle\.graal\.python\.test\.integration\.advanced\.AsyncActionThreadingTest']
418423
configs.append(TestConfig("async", vm_args + ['-Dpython.AutomaticAsyncActions=false', 'com.oracle.graal.python.test', 'org.graalvm.python.embedding.utils.test'] + async_regex + args, True, False))

0 commit comments

Comments
 (0)