From d111ed638a96de863e30f87a9d06810978197840 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 5 Apr 2024 19:43:56 +0200
Subject: [PATCH] Make sh-script-tests.el more robust

* test/lisp/progmodes/sh-script-tests.el (test-sh-script-indentation)
(test-basic-sh-indentation, test-indent-after-continuation):
* test/lisp/progmodes/sh-script-resources/sh-indents.erts (Code):
Skip if `sh-indent-supported-here' is nil.  (Bug#70196)

(cherry picked from commit aa356d03aeb13942ae6688ce919e0aa9fb4f1689)
---
 test/lisp/progmodes/sh-script-resources/sh-indents.erts | 4 ++++
 test/lisp/progmodes/sh-script-tests.el                  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/test/lisp/progmodes/sh-script-resources/sh-indents.erts b/test/lisp/progmodes/sh-script-resources/sh-indents.erts
index 36f4e4c22ab..5a72df0e7ef 100644
--- a/test/lisp/progmodes/sh-script-resources/sh-indents.erts
+++ b/test/lisp/progmodes/sh-script-resources/sh-indents.erts
@@ -1,6 +1,10 @@
 Code:
   (lambda ()
     (shell-script-mode)
+    (unless sh-indent-supported-here
+      (ert-skip
+       '((skip-unless sh-indent-supported-here)
+	 :form sh-indent-supported-here :value nil)))
     (indent-region (point-min) (point-max)))
 
 Name: sh-indents1
diff --git a/test/lisp/progmodes/sh-script-tests.el b/test/lisp/progmodes/sh-script-tests.el
index e73d52399d3..45add34a111 100644
--- a/test/lisp/progmodes/sh-script-tests.el
+++ b/test/lisp/progmodes/sh-script-tests.el
@@ -30,6 +30,7 @@
     (insert "relative-path/to/configure --prefix=$prefix\\
              --with-x")
     (shell-script-mode)
+    (skip-unless sh-indent-supported-here)
     (goto-char (point-min))
     (forward-line 1)
     (indent-for-tab-command)
@@ -42,6 +43,7 @@
   (with-temp-buffer
     (insert "myecho () {\necho foo\n}\n")
     (shell-script-mode)
+    (skip-unless sh-indent-supported-here)
     (indent-region (point-min) (point-max))
     (should (equal (buffer-string)
   "myecho () {
@@ -56,6 +58,7 @@
   (with-temp-buffer
     (insert "for f \\\nin a; do \\\ntoto; \\\ndone\n")
     (shell-script-mode)
+    (skip-unless sh-indent-supported-here)
     (let ((sh-indent-for-continuation '++))
       (let ((sh-indent-after-continuation t))
         (indent-region (point-min) (point-max))
-- 
2.39.5