Disable JNA for Mac/M1 platform (#721)

jline · Oct 18, 2021 · fd2589f · fd2589f
1 parent 427d05e
commit fd2589f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaNativePty.java
@@ -38,6 +38,9 @@ public abstract class JnaNativePty extends AbstractPty implements Pty {
 
     public static JnaNativePty current() throws IOException {
         if (Platform.isMac()) {
+            if (Platform.is64Bit() && Platform.isARM()) {
+                throw new UnsupportedOperationException();
+            }
             return OsXNativePty.current();
         } else if (Platform.isLinux()) {
             return LinuxNativePty.current();

diff --git a/terminal-jna/src/test/java/org/jline/terminal/impl/jna/JnaNativePtyTest.java b/terminal-jna/src/test/java/org/jline/terminal/impl/jna/JnaNativePtyTest.java
@@ -8,9 +8,15 @@
  */
 package org.jline.terminal.impl.jna;
 
+import java.io.IOException;
+
+import com.sun.jna.Platform;
+import org.jline.terminal.Size;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 public class JnaNativePtyTest {
@@ -20,4 +26,22 @@ public void testDescriptor() {
         assumeTrue(!System.getProperty( "os.name" ).startsWith( "Windows"));
         assertNotNull(JnaNativePty.newDescriptor(4));
     }
+
+
+    @Test
+    public void testOpen() throws IOException {
+        // https://github.com/jline/jline3/issues/688
+        // currently disabled on Mac M1 silicon
+        assumeFalse(Platform.isMac() && Platform.is64Bit() && Platform.isARM());
+        assumeFalse(Platform.isWindows());
+        JnaNativePty pty = JnaNativePty.open(null, null);
+        assertNotNull(pty);
+        Size sz = pty.getSize();
+        assertNotNull(sz);
+        Size nsz = new Size(sz.getColumns() + 1, sz.getRows() + 1);
+        pty.setSize(nsz);
+        sz = pty.getSize();
+        assertNotNull(sz);
+        assertEquals(nsz, sz);
+    }
 }