Merge pull request #11571

tests/checks/check-sphinx.fish

@@ -1,33 +0,0 @@
-#RUN: fish_indent=%fish_indent fish=%fish %fish %s
-#REQUIRES: command -v sphinx-build
-
-set -g tmp_dir (mktemp -d)
-
-function build_docs --argument-names builder
-    set -l repo_root (status dirname)/../..
-    set -l docsrc $repo_root/doc_src
-    set -l doctree $tmp_dir/doctree
-    set -l output_dir $tmp_dir/$builder
-    # sphinx-build needs fish_indent in $PATH
-    set -lxp PATH (path dirname $fish_indent)
-    sphinx-build \
-        -j auto \
-        -q \
-        -W \
-        -E \
-        -b $builder \
-        -c $docsrc \
-        -d $doctree \
-        $docsrc \
-        $output_dir
-end
-
-set -l success true
-build_docs man || set -l success false
-build_docs html || set -l success false
-
-rm -r $tmp_dir
-
-if test $success = false
-    exit 1
-end

tests/checks/sphinx-html.fish

@@ -0,0 +1,7 @@
+#RUN: fish_indent=%fish_indent fish=%fish %fish %s
+#REQUIRES: command -v sphinx-build
+
+set -l build_script (status dirname)/../test_functions/sphinx-shared.sh
+# sphinx-build needs fish_indent in $PATH
+set -lxp PATH (path dirname $fish_indent)
+$build_script html

tests/checks/sphinx-man.fish

@@ -0,0 +1,7 @@
+#RUN: fish_indent=%fish_indent fish=%fish %fish %s
+#REQUIRES: command -v sphinx-build
+
+set -l build_script (status dirname)/../test_functions/sphinx-shared.sh
+# sphinx-build needs fish_indent in $PATH
+set -lxp PATH (path dirname $fish_indent)
+$build_script man

tests/test_functions/sphinx-shared.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+cleanup () {
+  if [ -n "$tmp_dir" ] && [ -e "$tmp_dir" ]; then
+    rm -r "$tmp_dir"
+  fi
+}
+
+trap cleanup EXIT INT TERM HUP
+
+repo_root=$(dirname "$0")/../..
+builder=$1
+docsrc=$repo_root/doc_src
+tmp_dir=$(mktemp -d)
+doctree=$tmp_dir/doctree
+output_dir=$tmp_dir/$builder
+sphinx-build \
+  -j auto \
+  -q \
+  -W \
+  -E \
+  -b "$builder" \
+  -c "$docsrc" \
+  -d "$doctree" \
+  "$docsrc" \
+  "$output_dir"