From f0a331e0156fd4f63c228ea26a601ccdfe598c8b Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Fri, 27 Dec 2024 10:26:18 +0100 Subject: [PATCH] ts: test spider_indepth config option Signed-off-by: Xavier Delaruelle --- testsuite/install.00-init/010-environ.exp | 3 ++- testsuite/modules.00-init/010-environ.exp | 3 ++- testsuite/modules.70-maint/220-config.exp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testsuite/install.00-init/010-environ.exp b/testsuite/install.00-init/010-environ.exp index 78e82f5b..f28a2651 100644 --- a/testsuite/install.00-init/010-environ.exp +++ b/testsuite/install.00-init/010-environ.exp @@ -72,7 +72,8 @@ unsetenv_var MODULES_CONFLICT_UNLOAD set env(MODULES_IMPLICIT_REQUIREMENT) 1 # clean any in depth mode configuration -catch {unset env(MODULES_AVAIL_INDEPTH)} +unsetenv_var MODULES_AVAIL_INDEPTH +unsetenv_var MODULES_SPIDER_INDEPTH # clean any unload match order config catch {unset env(MODULES_UNLOAD_MATCH_ORDER)} diff --git a/testsuite/modules.00-init/010-environ.exp b/testsuite/modules.00-init/010-environ.exp index a381511c..b7b84e62 100644 --- a/testsuite/modules.00-init/010-environ.exp +++ b/testsuite/modules.00-init/010-environ.exp @@ -69,7 +69,8 @@ unsetenv_var MODULES_CONFLICT_UNLOAD setenv_var MODULES_IMPLICIT_REQUIREMENT 1 # clean any in depth mode configuration -catch {unset env(MODULES_AVAIL_INDEPTH)} +unsetenv_var MODULES_AVAIL_INDEPTH +unsetenv_var MODULES_SPIDER_INDEPTH # clean any unload match order config catch {unset env(MODULES_UNLOAD_MATCH_ORDER)} diff --git a/testsuite/modules.70-maint/220-config.exp b/testsuite/modules.70-maint/220-config.exp index c0691b1c..93c74946 100644 --- a/testsuite/modules.70-maint/220-config.exp +++ b/testsuite/modules.70-maint/220-config.exp @@ -71,7 +71,6 @@ array set configdfl [list\ color "never \\\(env-var\\\)"\ colors [expr {$install_termbg eq {dark} ? $valid_darkbgcolors : $valid_lightbgcolors}]\ conflict_unload [expr {$install_conflictunload eq {y}}]\ - avail_indepth [expr {$install_availindepth eq {y}}]\ contact root@localhost\ editor "$install_editor"\ extended_default [expr {$install_extendeddefault eq {y}}]\ @@ -106,6 +105,7 @@ array set configdfl [list\ silent_shell_debug [expr {$install_silentshdbgsupport eq {y}}]\ siteconfig $siteconfig_filere\ source_cache [expr {$install_sourcecache eq {y}}]\ + spider_indepth [expr {$install_spiderindepth eq {y}}]\ spider_output $install_spideroutput\ spider_terse_output $install_spiderterseoutput\ sticky_purge $install_stickypurge\ @@ -168,6 +168,7 @@ array set configvar [list\ shells_with_ksh_fpath MODULES_SHELLS_WITH_KSH_FPATH\ silent_shell_debug MODULES_SILENT_SHELL_DEBUG\ source_cache MODULES_SOURCE_CACHE\ + spider_indepth MODULES_SPIDER_INDEPTH\ spider_output MODULES_SPIDER_OUTPUT\ spider_terse_output MODULES_SPIDER_TERSE_OUTPUT\ sticky_purge MODULES_STICKY_PURGE\ @@ -217,6 +218,7 @@ array set configvalid [list\ shells_with_ksh_fpath {sh bash csh tcsh fish}\ silent_shell_debug {0 1}\ source_cache {0 1}\ + spider_indepth {0 1}\ spider_output {modulepath alias dirwsym indesym sym tag key hidden variant variantifspec}\ spider_terse_output {modulepath alias dirwsym indesym sym tag key hidden variant variantifspec}\ sticky_purge {error warning silent}\