From bbada91fb007fd715491fe61e375ad1ebe9d8cc8 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Thu, 3 Aug 2017 22:15:00 +0200
Subject: [PATCH] testsuite: harden tests using '.*' regexp

---
 testsuite/modules.00-init/015-version.exp          | 4 ++--
 testsuite/modules.20-locate/080-access.exp         | 4 ++--
 testsuite/modules.50-cmds/282-info-command.exp     | 4 ++--
 testsuite/modules.50-cmds/283-info-command-exp.exp | 2 +-
 testsuite/modules.91-sort/030-whatis.exp           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testsuite/modules.00-init/015-version.exp b/testsuite/modules.00-init/015-version.exp
index ad1b7975..d45c805e 100644
--- a/testsuite/modules.00-init/015-version.exp
+++ b/testsuite/modules.00-init/015-version.exp
@@ -37,5 +37,5 @@ set shell "sh"
 # Check the version at first
 #
 
-testouterr_cmd_re "csh" "--version" "" "Modules Release $exp_vers.*"
-testouterr_cmd_re "csh" "-V" "" "Modules Release $exp_vers.*"
+testouterr_cmd_re "csh" "--version" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"
+testouterr_cmd_re "csh" "-V" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"
diff --git a/testsuite/modules.20-locate/080-access.exp b/testsuite/modules.20-locate/080-access.exp
index e4a7cc6e..a534eed2 100644
--- a/testsuite/modules.20-locate/080-access.exp
+++ b/testsuite/modules.20-locate/080-access.exp
@@ -131,7 +131,7 @@ testouterr_cmd "sh" "load $m4" "ERR" "$access_msg '$lmf4'"
 testouterr_cmd "sh" "display $m4" "ERR" "$access_msg '$lmf4'"
 # no error on whatis/avail, other versions are listed
 testouterr_cmd_re "sh" "whatis $m4" "OK" "$pheader\n\\s+$m4/2.0: $m4/2.0\n\\s+$m4/3.0: $m4/3.0"
-testouterr_cmd_re "sh" "avail -t $m4" "" "$pheader\n$m4/2.0\\(.*\\)\n$m4/3.0\\(.*\\)"
+testouterr_cmd_re "sh" "avail -t $m4" "" "$pheader\n$m4/2.0\\(\[a-z:\]+\\)\n$m4/3.0\\(\[a-z:\]+\\)"
 
 restore_file_perms $lmf4
 
@@ -152,7 +152,7 @@ lappend ans [list set testsuite yes]
 testouterr_cmd "sh" "load $m5" $ans ""
 testouterr_cmd_re "sh" "display $m5" "OK" "$modlin\n$rlmf5:\n\nmodule-whatis\t$rlm5\nsetenv\t\ttestsuite\tyes\n$modlin"
 testouterr_cmd_re "sh" "whatis $m5" "OK" "$pheader\n\\s+$rlm5: $rlm5"
-testouterr_cmd_re "sh" "avail -t $m5" "" "$pheader\n$rlm5\\(.*\\)"
+testouterr_cmd_re "sh" "avail -t $m5" "" "$pheader\n$rlm5\\(\[a-z:\]+\\)"
 
 # keep file permissions as it is for next test
 
diff --git a/testsuite/modules.50-cmds/282-info-command.exp b/testsuite/modules.50-cmds/282-info-command.exp
index 814e58ab..3f0052d3 100644
--- a/testsuite/modules.50-cmds/282-info-command.exp
+++ b/testsuite/modules.50-cmds/282-info-command.exp
@@ -49,10 +49,10 @@ testerr_cmd "sh" "load $module" "load"
 testerr_cmd_re "sh" "display $module" "$modlin\n$modulefile:\n\ndisplay\n$modlin"
 
 # test whatis
-testerr_cmd_re "sh" "whatis $module" "$header\n\\s+$module: whatis\n.*"
+testerr_cmd_re "sh" "whatis $module" "$header\n\\s+$module: whatis(\\n\\s+\\S*$module\\S*: .*)*"
 
 # test searching
-testerr_cmd_re "sh" "search search" "$header\n\\s+$module: search\n.*"
+testerr_cmd_re "sh" "search search" "$header\n\\s+$module: search(\\n\\s+\\S+: search)*"
 
 # test sourcing
 testerr_cmd "sh" "source $modulefile" "source"
diff --git a/testsuite/modules.50-cmds/283-info-command-exp.exp b/testsuite/modules.50-cmds/283-info-command-exp.exp
index c10008fd..57cdf4aa 100644
--- a/testsuite/modules.50-cmds/283-info-command-exp.exp
+++ b/testsuite/modules.50-cmds/283-info-command-exp.exp
@@ -52,7 +52,7 @@ testerr_cmd_re "sh" "display $module" "$modlin\n$modulefile:\n\ndisplay\n$modlin
 testerr_cmd_re "sh" "whatis $module" "$header\n\\s+$module: whatis"
 
 # test searching
-testerr_cmd_re "sh" "search search" "$header\n.*\n\\s+$module: search"
+testerr_cmd_re "sh" "search search" "$header\n(\\s+\\S+: search\\n)*\\s+$module: search"
 
 # test sourcing
 testerr_cmd "sh" "source $modulefile" "source"
diff --git a/testsuite/modules.91-sort/030-whatis.exp b/testsuite/modules.91-sort/030-whatis.exp
index 454762b9..b39b64b5 100644
--- a/testsuite/modules.91-sort/030-whatis.exp
+++ b/testsuite/modules.91-sort/030-whatis.exp
@@ -24,7 +24,7 @@
 #
 ##############################################################################
 
-set wissep ": (.*)"
+set wissep ": module version sort test"
 set header "$modlin $MODULEPATH $modlin\n"
 
 #