ts: remove default_tclsh and expect TCLSH env var to be set

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

Author: xdelaruelle

testsuite/config/unix.exp

@@ -61,26 +61,6 @@ proc default_modulecmd {} {
 
 }
 
-proc default_tclsh {} {
-   global TCLSH
-   global verbose
-   global env
-
-   if ![info exists TCLSH] then {
-      if [info exists env(TCLSH)] {
-         set TCLSH $env(TCLSH)
-      } else {
-	     set TCLSH [which modulecmd]
-	     if ![file exists $TCLSH] then {
-		    fail "No 'tclsh' found"
-		    exit -1
-	     } elseif { $verbose > 1 } {
-		    send_user "using 'tclsh' from search path"
-	     }
-      }
-   }
-}
-
 
 #
 # modulecmd_xxx_ -- run modulecmd
@@ -130,7 +110,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
 	}
 
 	default_modulecmd
-	default_tclsh
 
     set cmdlist [list $TCLSH $MODULECMD $shell]
     # check if asked not to split passed command line
@@ -185,7 +164,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
 	}
 
 	default_modulecmd
-	default_tclsh
 
     set cmdlist [list exec $TCLSH $MODULECMD $shell]
     # check if asked not to split passed command line

testsuite/modules.00-init/005-init_ts.exp

@@ -26,6 +26,11 @@
 
 send_user "\tInitializing the testsuite ...\n"
 
+# excepted information to run the testsuite
+set TCLSH $env(TCLSH)
+send_user "\tTCLSH is '$TCLSH'\n"
+
+
 # Modules release number
 set major_minor_rel [join [lrange [split $install_version .] 0 1] .]
 
@@ -321,7 +326,6 @@ if {![string length $lsb_cmd]} {
 }
 
 # fetch tclsh version used to adapt tests producing different output depending on this version
-default_tclsh
 catch {set tclsh_version [exec $TCLSH << {puts [info tclversion]}]} errMsg
 if {[info exists tclsh_version]} {
     send_user "\ttclsh version is $tclsh_version\n"

testsuite/modules.50-cmds/400-source-sh.exp

@@ -1600,7 +1600,6 @@ setenv_var TESTSUITE_SHTOMOD_MODULE 1
 # changes made by the script
 setenv_var MODULES_SET_SHELL_STARTUP 0
 setenv_var MODULES_CMD [file normalize $env(TESTSUITEDIR)/../modulecmd.tcl]
-setenv_var TCLSH $TCLSH
 
 set lmsourceshpath {}
 # setup simpler MANPATH value for tests if autoinit adds Modules man location to MANPATH

testsuite/modules.70-maint/310-sh-to-mod.exp

@@ -797,7 +797,6 @@ setenv_var TESTSUITE_SHTOMOD_MODULE 1
 # changes made by the script
 setenv_var MODULES_SET_SHELL_STARTUP 0
 setenv_var MODULES_CMD [file normalize $env(TESTSUITEDIR)/../modulecmd.tcl]
-setenv_var TCLSH $TCLSH
 
 # if module was defined in environment prior test, the result of the source-sh evaluation
 # will be the unset of the module functions

testsuite/modules.70-maint/311-eval-sh-to-mod.exp

@@ -475,7 +475,6 @@ setenv_var TESTSUITE_SHTOMOD_MODULE 1
 # changes made by the script
 setenv_var MODULES_SET_SHELL_STARTUP 0
 setenv_var MODULES_CMD [file normalize $env(TESTSUITEDIR)/../modulecmd.tcl]
-setenv_var TCLSH $TCLSH
 
 # if module was defined in environment prior test, the result of the source-sh evaluation
 # will be the unset of the module functions