ts: remove default_modulecmd and expect MODULECMD env var to be set

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

Author: xdelaruelle

Makefile

@@ -38,6 +38,12 @@ OPENFOAM_REPOURL := https://github.com/OpenFOAM/OpenFOAM-dev.git
 
 # specific modulecmd script for test
 MODULECMDTEST := modulecmd-test.tcl
+# if coverage enabled, run tests on instrumented file to create coverage log
+ifeq ($(COVERAGE),y)
+MODULECMD := $(MODULECMDTEST)_i
+else
+MODULECMD := $(MODULECMDTEST)
+endif
 
 # definitions for enhanced diff tool (to review test results)
 ICDIFF_DLSRC := https://raw.githubusercontent.com/jeffkaufman/icdiff/release-2.0.4/
@@ -51,10 +57,9 @@ include Makefile.inc
 
 INSTALL_PREREQ := modulecmd.tcl ChangeLog.gz README script/add.modules \
 	script/modulecmd
+TEST_PREREQ := $(MODULECMD)
 ifeq ($(COVERAGE),y)
-TEST_PREREQ := $(MODULECMDTEST)_i $(NAGELFAR)
-else
-TEST_PREREQ := $(MODULECMDTEST)
+TEST_PREREQ += $(NAGELFAR)
 endif
 
 ifeq ($(libtclenvmodules),y)
@@ -953,17 +958,13 @@ $(MODULECMDTEST)_i: tcl/cache.tcl_i tcl/coll.tcl_i tcl/envmngt.tcl_i \
 	echo 'source tcl/main.tcl_i' >> $@
 	chmod +x $@
 
-# if coverage enabled, run tests on instrumented file to create coverage log
-ifeq ($(COVERAGE),y)
-export MODULECMD = $(MODULECMDTEST)_i
-endif
-
 # specific target to build test dependencies
 test-deps: $(TEST_PREREQ)
 
 # if coverage enabled create markup file for better read coverage result
 test: $(TEST_PREREQ)
 	TCLSH=$(TCLSH); export TCLSH; \
+	MODULECMD=$(MODULECMD); export MODULECMD; \
 	OBJDIR=`pwd -P`; export OBJDIR; \
 	TESTSUITEDIR=`cd testsuite;pwd -P`; export TESTSUITEDIR; \
 	runtest --srcdir $$TESTSUITEDIR --objdir $$OBJDIR $(RUNTESTFLAGS) --tool modules $(RUNTESTFILES)

testsuite/config/unix.exp

@@ -21,47 +21,6 @@
 #
 ##############################################################################
 
-#
-# the default for the modulecmd binary is the one in the upper directory
-# if it doesn't exist, look up the search path in order to locate one.
-#
-
-proc default_modulecmd {} {
-    global MODULECMD
-    global verbose
-    global env
-
-    if ![info exists MODULECMD] then {
-    if [info exists env(MODULECMD)] {
-        set MODULECMD $env(MODULECMD)
-	} elseif [file exists ../modulecmd] then {
-	    set MODULECMD "../modulecmd"
-	} elseif [file exists ./modulecmd] then {
-	    set MODULECMD "./modulecmd"
-	# use test-specific modulecmd.tcl script if it exists
-	} elseif [file exists "./modulecmd-test.tcl"] then {
-	  set MODULECMD "./modulecmd-test.tcl"
-	# check for modulecmd.tcl before guessing from path
-	# to give this flavor a chance to be found when modulecmd
-	# binary is also installed in system default paths
-	} elseif [file exists "../modulecmd.tcl"] then {
-	  set MODULECMD "../modulecmd.tcl"
-	} elseif [file exists "./modulecmd.tcl"] then {
-	  set MODULECMD "./modulecmd.tcl"
-	} else {
-	    set MODULECMD [which modulecmd]
-	    if ![file exists $MODULECMD] then {
-		fail "No 'modulecmd' found"
-		exit -1
-	    } elseif { $verbose > 1 } {
-		send_user "using 'modulecmd' from search path"
-	    }
-	}
-    }
-
-}
-
-
 #
 # modulecmd_xxx_ -- run modulecmd
 #
@@ -109,8 +68,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
 	  unresolved "internal testsuite error: no module command specified"
 	}
 
-	default_modulecmd
-
     set cmdlist [list $TCLSH $MODULECMD $shell]
     # check if asked not to split passed command line
     if {[string first "NOCMDSPLIT" $command] == 0} {
@@ -163,8 +120,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
 	  unresolved "internal testsuite error: no module command specified"
 	}
 
-	default_modulecmd
-
     set cmdlist [list exec $TCLSH $MODULECMD $shell]
     # check if asked not to split passed command line
     if {[string first "NOCMDSPLIT" $command] == 0} {

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

@@ -29,6 +29,8 @@ send_user "\tInitializing the testsuite ...\n"
 # excepted information to run the testsuite
 set TCLSH $env(TCLSH)
 send_user "\tTCLSH is '$TCLSH'\n"
+set MODULECMD $env(MODULECMD)
+send_user "\tMODULECMD is '$MODULECMD'\n"
 
 
 # Modules release number
@@ -338,9 +340,6 @@ if {[info exists tclsh_version]} {
 set pager_dfl_use [expr {[file tail $install_pager] ni {{} cat}}]
 
 
-default_modulecmd
-
-
 #
 # Regular expressions matching error and warning outputs
 #

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

@@ -196,5 +196,7 @@ set ORIG_PATH $env(PATH)
 setenv_var HOME $env(TESTSUITEDIR)
 set ORIG_HOME $env(HOME)
 
+set ORIG_MODULECMD $MODULECMD
+
 unsetenv_var testsuite
 

testsuite/modules.00-init/170-cwd.exp

@@ -45,7 +45,7 @@ if {![info exists env(COVERAGE)] && $os_name ni {cygwin mingw msys}\
 
     # move back to testsuite working directory
     cd $ORIG_CWD
-    unset MODULECMD
+    set MODULECMD $ORIG_MODULECMD
 }
 
 # test pwd error catch in getAbsolutePath for coverage mode by superseding

testsuite/modules.70-maint/090-source.exp

@@ -83,7 +83,7 @@ if {![info exists env(COVERAGE)] && [cmpversion $tclsh_version 8.6] > -1} {
 
     # move back to testsuite working directory
     cd $ORIG_CWD
-    unset MODULECMD
+    set MODULECMD $ORIG_MODULECMD
 }
 
 # test existing modulefile