8304498: JShell does not switch to raw mode when there is no /bin/test

src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java

@@ -9,6 +9,8 @@
 package jdk.internal.org.jline.utils;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 public class OSUtils {
 
@@ -93,7 +95,8 @@ public class OSUtils {
  stty = IS_OSX ? "/bin/stty" : "stty";
  sttyfopt = IS_OSX ? "-f" : "-F";
  infocmp = "infocmp";
- test = "/bin/test";
+ test = isTestCommandValid("/usr/bin/test") ? "/usr/bin/test"
+ : "/bin/test";
  }
  TTY_COMMAND = tty;
  STTY_COMMAND = stty;
@@ -102,4 +105,7 @@ public class OSUtils {
  TEST_COMMAND = test;
  }
 
+ private static boolean isTestCommandValid(String command) {
+ return Files.isExecutable(Paths.get(command));
+ }
 }

test/jdk/jdk/internal/jline/OSUtilsTest.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8304498
+ * @summary Verify the OSUtils class is initialized properly
+ * @modules jdk.internal.le/jdk.internal.org.jline.utils
+ */
+
+import jdk.internal.org.jline.utils.OSUtils;
+
+public class OSUtilsTest {
+ public static void main(String... args) throws Exception {
+ new OSUtilsTest().run();
+ }
+
+ void run() throws Exception {
+ runTestTest();
+ }
+
+ void runTestTest() throws Exception {
+ if (OSUtils.IS_WINDOWS) {
+ return ; //skip on Windows
+ }
+
+ Process p = new ProcessBuilder(OSUtils.TEST_COMMAND, "-z", "").inheritIO().start();
+ if (p.waitFor() != 0) {
+ throw new AssertionError("Unexpected result!");
+ }
+ }
+}