ts: clean test code relative to Modules v3 "update" sub-cmd

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

doc/source/changes.rst

@@ -1016,6 +1016,12 @@ The following module sub-commands appeared on Modules 5.
  header indicates the oldest Modules version compatible with this cache file
  (5.3), rather than the version that generated the cache file.
 
+:subcmd:`update`
+
+ This sub-command is reintroduced (was part of Modules v3) as a simple alias
+ of :subcmd:`reload` sub-command. No more support from ``MODULESBEGINENV``,
+ initial environment handling now covers this use case.
+
 Environment
 """""""""""
 

testsuite/config/base-config.exp

@@ -21,44 +21,6 @@
 #
 ##############################################################################
 
-#
-# some tests only apply if the configure option is enabled or not
-#   look at ./modulecmd --version for examples
-#   (e.g. version_test("XXX=undef") returns 0 or 1 if the string is found)
-# 	if { [ version_test "XXX=1" ] } {
-#	} else {
-#	}
-#
-proc version_test {which} {
-	global comp_output
-	global comp_error
-	global verbose
-
-	if { $verbose > 1 } {
-		send_user "   ...  version_test($which)\n"
-	}
-	set comp_output ""
-	set comp_error ""
-
-	if { ![info exists which] } {
-		unresolved "version_test ($which) internal error"
-	}
-
-	modulecmd__ "--version"
-
-	if { ![regexp -- ".*$which.*" $comp_error] } {
-		if { $verbose > 1 } {
-			send_user "version_test: 0\n"
-		}
-		return 0
-	} else {
-		if { $verbose > 1 } {
-			send_user "version_test: 1\n"
-		}
-		return 1
-	}
-}
-
 #
 # Shell conversion code subprocedures
 #

testsuite/config/unix.exp

@@ -265,20 +265,6 @@ proc modulecmd_start {command {input noinput}} {
 	unset no_verbose
 }
 
-#
-# modulecmd__ -- start modulecmd running
-#   (same as above but no verbose output)
-
-proc modulecmd__ {command} {
-	global shell
-	global no_verbose
-
-	set shell "sh"
-	set no_verbose 1
-	modulecmd_xxx_ "$command"
-	unset no_verbose
-}
-
 #
 # modulecmd_version -- extract and print the version number of modulecmd
 #

testsuite/modules.00-init/010-environ.exp

@@ -193,5 +193,8 @@ catch {unset env(MODULESHOME)}
 
 set ORIG_PATH $env(PATH)
 
+setenv_var HOME $env(TESTSUITEDIR)
+set ORIG_HOME $env(HOME)
+
 unsetenv_var testsuite
 

testsuite/modules.00-init/080-begenv.exp

@@ -53,7 +53,6 @@ testouterr_cmd_re "ALL" "$use $badpath" $ans {}
 
 #
 # The tests ...
-#   do these last so the .modulesbeginenv is left in a good state for 070-Maint
 #
 
 set ans [list]

testsuite/modules.10-use/070-unuse.exp

@@ -44,9 +44,6 @@ unset modulepath
 if { $verbose > 1 } {
 	send_user "\tCleaning up after all tests ...\n"
 }
-if { [ version_test "BEGINENV=\[1-9\]" ] } {
-	file delete $env(_MODULESBEGINENV_)
-}
 
 # restore orig saved test env
 save_test_env