From 2984dcee2e7e2bb9ead072d4b3e04a4d7fa925a3 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Sun, 29 May 2022 20:16:43 +0200
Subject: [PATCH] ts: test misplaced/invalid prereq option in 50/550

---
 testsuite/modulefiles.3/optional/1.0          |  3 +++
 testsuite/modules.50-cmds/465-tag-opt.exp     | 20 ++++---------------
 .../modules.50-cmds/550-optional-opt.exp      | 15 +++++++-------
 testsuite/modules.70-maint/240-icase.exp      |  5 +++--
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/testsuite/modulefiles.3/optional/1.0 b/testsuite/modulefiles.3/optional/1.0
index 6a218dd2..3b7aea37 100644
--- a/testsuite/modulefiles.3/optional/1.0
+++ b/testsuite/modulefiles.3/optional/1.0
@@ -76,5 +76,8 @@ if {[info exists env(TESTSUITE_OPTIONAL_OPT)]} {
         err1 {
             prereq foo/1.0 --optional
         }
+        err2 {
+            prereq --foo --optional foo/1.0
+        }
     }
 }
diff --git a/testsuite/modules.50-cmds/465-tag-opt.exp b/testsuite/modules.50-cmds/465-tag-opt.exp
index c7c4708b..87e0f704 100644
--- a/testsuite/modules.50-cmds/465-tag-opt.exp
+++ b/testsuite/modules.50-cmds/465-tag-opt.exp
@@ -1187,24 +1187,12 @@ unsetenv_path_var __MODULES_LMTAG
 setenv_var TESTSUITE_TAG_OPT prtagbad1
 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
 setenv_var MODULES_IMPLICIT_DEFAULT 1
-set ans [list]
-lappend ans [list set __MODULES_LMALTNAME foo/2.0&as|foo/default&as|foo/latest]
-lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0\ --tag|foo]
-lappend ans [list set _LMFILES_ $mp/foo/2.0:$modfile]
-lappend ans [list set LOADEDMODULES foo/2.0:$mod]
-lappend ans [list set __MODULES_LMTAG foo/2.0&auto-loaded]
-lappend ans [list ERR]
-set tserr [msg_top_load $mod {} foo/2.0 {}]
-testouterr_cmd sh "load --auto $mod" $ans $tserr
+set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 68}]
+set tserr [escre [msg_load $mod [msg_moderr {Misplaced option '--tag'} {prereq foo/1.0 --tag foo<EXM>} $modfile $ln]]]
+testouterr_cmd_re sh "load --auto $mod" ERR $tserr
 
 setenv_var MODULES_ADVANCED_VERSION_SPEC 0
-set ans [list]
-lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0|--tag|foo]
-lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
-lappend ans [list set LOADEDMODULES foo/1.0:$mod]
-lappend ans [list set __MODULES_LMTAG foo/1.0&auto-loaded]
-set tserr [msg_top_load $mod {} foo/1.0 {}]
-testouterr_cmd sh "load --auto $mod" $ans $tserr
+testouterr_cmd_re sh "load --auto $mod" ERR $tserr
 unsetenv_var MODULES_IMPLICIT_DEFAULT
 unsetenv_var MODULES_ADVANCED_VERSION_SPEC
 
diff --git a/testsuite/modules.50-cmds/550-optional-opt.exp b/testsuite/modules.50-cmds/550-optional-opt.exp
index a144d798..ab38c63a 100644
--- a/testsuite/modules.50-cmds/550-optional-opt.exp
+++ b/testsuite/modules.50-cmds/550-optional-opt.exp
@@ -432,14 +432,15 @@ testouterr_cmd sh "load --no-auto $mod" $ans $tserr
 
 # wrongly positioned --optional argument
 setenv_var TESTSUITE_OPTIONAL_OPT err1
+set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 2 : 77}]
+set tserr [escre [msg_load $mod [msg_moderr {Misplaced option '--optional'} {prereq foo/1.0 --optional<EXM>} $modfile $ln]]]
+testouterr_cmd_re sh "load --auto $mod" ERR $tserr
 
-set ans [list]
-lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0|foo/1.0]
-lappend ans [list set _LMFILES_ $modfile]
-lappend ans [list set LOADEDMODULES $mod]
-lappend ans [list ERR]
-set tserr [msg_load foo/1.0{--optional} [err_unkvar -optional]]\n\n[msg_load $mod [err_reqlo foo/1.0{--optional}]]
-testouterr_cmd sh "load --auto $mod" ERR $tserr
+# invalid option
+setenv_var TESTSUITE_OPTIONAL_OPT err2
+set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 2 : 80}]
+set tserr [escre [msg_load $mod [msg_moderr {Invalid option '--foo'} {prereq --foo --optional foo/1.0<EXM>} $modfile $ln]]]
+testouterr_cmd_re sh "load --auto $mod" ERR $tserr
 
 
 # no requirement loaded, then load first one
diff --git a/testsuite/modules.70-maint/240-icase.exp b/testsuite/modules.70-maint/240-icase.exp
index 132b2e0d..2100c3f0 100644
--- a/testsuite/modules.70-maint/240-icase.exp
+++ b/testsuite/modules.70-maint/240-icase.exp
@@ -308,8 +308,9 @@ lappend ans [list set _LMFILES_ $mp/icase/unload]
 lappend ans [list set LOADEDMODULES icase/unload]
 testouterr_cmd_re sh {load --icase icase/unload} $ans {}
 
-testouterr_cmd_re sh {load --icase --auto icase/loadi} ERR [msg_load icase/loadi $err_path'--icase' [err_reqlo --icase]]
-testouterr_cmd_re sh {load --auto icase/loadi} ERR [msg_load icase/loadi $err_path'--icase' [err_reqlo --icase]]
+set tserr [msg_load icase/loadi [msg_moderr {Invalid option '--icase'} {module load --icase noCASE/1} $mp/icase/loadi 2]]
+testouterr_cmd sh {load --icase --auto icase/loadi} ERR $tserr
+testouterr_cmd sh {load --auto icase/loadi} ERR $tserr
 
 set ans [list]
 lappend ans [list set _LMFILES_ $mp/icase/isloaded]