"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "testsuite/install.00-init/030-options.exp" between
modules-5.1.1.tar.bz2 and modules-5.2.0.tar.bz2

About: The Environment Modules package provides for the dynamic modification of a user’s environment via modulefiles.

030-options.exp  (modules-5.1.1.tar.bz2)	:	030-options.exp  (modules-5.2.0.tar.bz2)
skipping to change at line 63		skipping to change at line 63
}		}
#		#
# The tests		# The tests
#		#
if {$install_setmanpath eq "y" && $install_builddoc ne "n"} {		if {$install_setmanpath eq "y" && $install_builddoc ne "n"} {
if {$verbose > 0} {		if {$verbose > 0} {
send_user "\tChecking man pages availability\n"		send_user "\tChecking man pages availability\n"
}		}
		unsetenv_var MANPATH
foreach shell $shell_list {		foreach shell $shell_list {
testall_cmd_re "$shell" "man -w modulefile" "$install_mandirre/man4/module file.*" {} 0		testall_cmd_re "$shell" "man -w modulefile" "$install_mandirre/man4/module file.*" {} 0
testall_cmd_re "$shell" "man -w module" "$install_mandirre/man1/module.*" {} 0		testall_cmd_re "$shell" "man -w module" "$install_mandirre/man1/module.*" {} 0
}		}
} elseif {$verbose > 0} {		} elseif {$verbose > 0} {
send_user "\tSkipping man pages availability checks\n"		send_user "\tSkipping man pages availability checks\n"
}		}
if {$install_setbinpath eq "y"} {		if {$install_setbinpath eq "y"} {
if {$verbose > 0} {		if {$verbose > 0} {
skipping to change at line 109		skipping to change at line 110
if {$verbose > 0} {		if {$verbose > 0} {
send_user "\tChecking other utilities availability\n"		send_user "\tChecking other utilities availability\n"
}		}
foreach shell $shell_list {		foreach shell $shell_list {
switch -- $shell {		switch -- $shell {
csh - tcsh {		csh - tcsh {
testall_cmd "$shell" "which add.modules" "$install_bindir/add.module s" "" 0		testall_cmd "$shell" "which add.modules" "$install_bindir/add.module s" "" 0
testall_cmd "$shell" "which mkroot" "$install_bindir/mkroot" "" 0		testall_cmd "$shell" "which mkroot" "$install_bindir/mkroot" "" 0
}		}
		ksh {
		if {[string first { } $install_bindir] != -1} {
		testall_cmd $shell {command -v add.modules} "'$install_bindir/add
		.modules'" {} 0
		testall_cmd $shell {command -v mkroot} "'$install_bindir/mkroot'"
		{} 0
		} else {
		testall_cmd $shell {command -v add.modules} $install_bindir/add.m
		odules {} 0
		testall_cmd $shell {command -v mkroot} $install_bindir/mkroot {}
		0
		}
		}
default {		default {
testall_cmd "$shell" "command -v add.modules" "$install_bindir/add.m odules" "" 0		testall_cmd "$shell" "command -v add.modules" "$install_bindir/add.m odules" "" 0
testall_cmd "$shell" "command -v mkroot" "$install_bindir/mkroot" "" 0		testall_cmd "$shell" "command -v mkroot" "$install_bindir/mkroot" "" 0
}		}
}		}
}		}
} elseif {$verbose > 0} {		} elseif {$verbose > 0} {
send_user "\tSkipping envml availability checks\n"		send_user "\tSkipping envml availability checks\n"
send_user "\tSkipping modulecmd availability checks\n"		send_user "\tSkipping modulecmd availability checks\n"
send_user "\tSkipping other utilities availability checks\n"		send_user "\tSkipping other utilities availability checks\n"
skipping to change at line 233		skipping to change at line 243
unset env(MODULES_SILENT_SHELL_DEBUG)		unset env(MODULES_SILENT_SHELL_DEBUG)
} elseif {$verbose > 0} {		} elseif {$verbose > 0} {
send_user "\tSkipping silent shell debug checks\n"		send_user "\tSkipping silent shell debug checks\n"
}		}
# test Windows-specific install		# test Windows-specific install
if {$verbose > 0} {		if {$verbose > 0} {
send_user "\tChecking Windows-specific files availability\n"		send_user "\tChecking Windows-specific files availability\n"
}		}
testall_cmd_re "sh" "test -e $install_initdir/cmd.cmd" "" "" [expr {$install_win		testall_cmd_re "sh" "test -e '$install_initdir/cmd.cmd'" "" "" [expr {$install_w
dowssupport ne {y}}]		indowssupport ne {y}}]
testall_cmd_re "sh" "test -e $install_bindir/module.cmd" "" "" [expr {$install_w		testall_cmd_re "sh" "test -e '$install_bindir/module.cmd'" "" "" [expr {$install
indowssupport ne {y}}]		_windowssupport ne {y}}]
testall_cmd_re "sh" "test -e $install_bindir/ml.cmd" "" "" [expr {$install_windo		testall_cmd_re "sh" "test -e '$install_bindir/ml.cmd'" "" "" [expr {$install_win
wssupport ne {y}}]		dowssupport ne {y}}]
testall_cmd_re "sh" "test -e $install_bindir/envml.cmd" "" "" [expr {$install_wi		testall_cmd_re "sh" "test -e '$install_bindir/envml.cmd'" "" "" [expr {$install_
ndowssupport ne {y}}]		windowssupport ne {y}}]
		# test Nagelfar lint capabilities
		set nafelgar_script [glob -nocomplain nagelfar*/nagelfar.tcl]
		if {[string length $nafelgar_script] > 0} {
		if {$verbose > 0} {
		send_user "\tChecking Nagelfar linting\n"
		}
		set tserr "Linting $testsuite_modpath/prepend/1.6\n"
		append tserr " $error_msgs line 24: Wrong number of arguments (3) to \"pre
		pend-path\""
		testall_cmd sh "module config tcl_linter $nafelgar_script; module lint --redi
		rect $testsuite_modpath/prepend/1.6" $tserr {} 1
		set tserr "Linting $testsuite_modpath.3/lcompat/.version\n"
		append tserr " $warn_msgs line 6: Variable \"ModuleVersion\" should be renam
		ed \"ModulesVersion\"\n"
		append tserr " $warn_msgs line 10: Variable \"ModuleVersion\" should be rena
		med \"ModulesVersion\"\n"
		append tserr " $warn_msgs line 13: Variable \"ModuleVersion\" should be rena
		med \"ModulesVersion\""
		testall_cmd sh "module config tcl_linter $nafelgar_script; module lint --redi
		rect $testsuite_modpath.3/lcompat/.version" $tserr {} 0
		}
#		#
# Clean up variables used in this test case		# Clean up variables used in this test case
#		#
reset_test_env		reset_test_env
# vim:set tabstop=3 shiftwidth=3 expandtab autoindent:		# vim:set tabstop=3 shiftwidth=3 expandtab autoindent:
End of changes. 3 change blocks.
8 lines changed or deleted		44 lines changed or added

---