From 17cc3e2fc862d218b63534e77a6a836faf9b0d55 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Wed, 15 Nov 2023 12:53:15 -0700
Subject: [PATCH] ts: fix man search tests when Modules already installed

---
 testsuite/install.00-init/030-options.exp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testsuite/install.00-init/030-options.exp b/testsuite/install.00-init/030-options.exp
index 0483e1ede..ba3420027 100644
--- a/testsuite/install.00-init/030-options.exp
+++ b/testsuite/install.00-init/030-options.exp
@@ -63,8 +63,9 @@ if {$install_setmanpath eq "y" && $install_builddoc ne "n"} {
    }
    unsetenv_var MANPATH
    foreach shell $shell_list {
-      testall_cmd_re "$shell" "man -w modulefile" "$install_mandirre/man5/modulefile.*" {} 0
-      testall_cmd_re "$shell" "man -w module" "$install_mandirre/man1/module.*" {} 0
+      # ask for all man page locations to ensure finding ours rather others installed on the system
+      testall_cmd_re "$shell" "man -a -w modulefile" ".*$install_mandirre/man5/modulefile.*" {} 0
+      testall_cmd_re "$shell" "man -a -w module" ".*$install_mandirre/man1/module.*" {} 0
    }
 } elseif {$verbose} {
    send_user "\tSkipping man pages availability checks\n"