From 07d151f913985691c9f1ebf7ebbd3dc364ea33ef Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Thu, 22 Jul 2021 23:06:39 +0200
Subject: [PATCH] ts: add skip_if_quick_mode in 70 suite

---
 testsuite/modules.70-maint/030-purge.exp      |  2 ++
 testsuite/modules.70-maint/040-list.exp       |  2 ++
 testsuite/modules.70-maint/045-listlong.exp   |  1 +
 .../modules.70-maint/050-whatis-load.exp      |  2 ++
 testsuite/modules.70-maint/055-whatis.exp     |  3 +++
 .../modules.70-maint/056-whatis-nullpath.exp  |  2 ++
 testsuite/modules.70-maint/060-apropos.exp    |  3 +++
 testsuite/modules.70-maint/070-display.exp    |  2 ++
 testsuite/modules.70-maint/080-help.exp       |  3 +++
 testsuite/modules.70-maint/085-test.exp       |  3 +++
 testsuite/modules.70-maint/090-source.exp     |  2 ++
 testsuite/modules.70-maint/100-path.exp       |  2 ++
 testsuite/modules.70-maint/110-paths.exp      |  2 ++
 testsuite/modules.70-maint/120-autoinit.exp   |  2 ++
 testsuite/modules.70-maint/130-aliases.exp    |  2 ++
 testsuite/modules.70-maint/140-multiargs.exp  |  1 +
 .../modules.70-maint/150-append-path.exp      |  1 +
 .../modules.70-maint/151-prepend-path.exp     |  1 +
 .../modules.70-maint/152-remove-path.exp      |  1 +
 testsuite/modules.70-maint/153-is-loaded.exp  |  3 +++
 testsuite/modules.70-maint/154-is-saved.exp   |  3 +++
 testsuite/modules.70-maint/155-is-used.exp    |  2 ++
 .../modules.70-maint/157-info-loaded.exp      |  2 ++
 testsuite/modules.70-maint/170-contact.exp    |  2 ++
 testsuite/modules.70-maint/180-reload.exp     |  2 ++
 testsuite/modules.70-maint/190-emptyarg.exp   |  2 ++
 testsuite/modules.70-maint/200-errdisp.exp    |  2 ++
 testsuite/modules.70-maint/210-clear.exp      |  2 ++
 testsuite/modules.70-maint/220-config.exp     | 22 +++++++++++++------
 testsuite/modules.70-maint/230-verbosity.exp  |  2 ++
 testsuite/modules.70-maint/231-verbose2.exp   |  2 ++
 testsuite/modules.70-maint/240-icase.exp      |  2 ++
 testsuite/modules.70-maint/250-nan.exp        |  2 ++
 .../modules.70-maint/260-extended_default.exp |  2 ++
 .../modules.70-maint/270-adv_version_spec.exp |  2 ++
 .../271-adv_version_spec-in.exp               |  2 ++
 .../272-adv_version_spec-range.exp            |  2 ++
 .../273-adv_version_spec-space.exp            |  2 ++
 .../274-adv_version_spec-autosym.exp          |  2 ++
 .../275-adv_version_spec-loaded.exp           |  2 ++
 .../276-adv_version_spec-rangein.exp          |  3 +++
 testsuite/modules.70-maint/280-ml.exp         |  2 ++
 testsuite/modules.70-maint/290-json.exp       |  3 +++
 testsuite/modules.70-maint/300-err_stack.exp  |  2 ++
 testsuite/modules.70-maint/310-sh-to-mod.exp  |  3 +++
 testsuite/modules.70-maint/320-tags.exp       |  2 ++
 testsuite/modules.70-maint/321-tag_abbrev.exp |  2 ++
 testsuite/modules.70-maint/322-tag-sgr.exp    |  2 ++
 testsuite/modules.70-maint/330-large-file.exp |  2 ++
 testsuite/modules.70-maint/340-output-key.exp |  2 ++
 testsuite/modules.70-maint/350-term_width.exp |  2 ++
 .../modules.70-maint/360-avail_output.exp     |  3 +++
 .../modules.70-maint/361-list_output.exp      |  3 +++
 testsuite/modules.70-maint/370-variant.exp    |  2 ++
 .../modules.70-maint/371-variant-msg.exp      |  2 ++
 .../modules.70-maint/372-variant-display.exp  |  2 ++
 .../modules.70-maint/373-variant-help.exp     |  2 ++
 .../modules.70-maint/374-variant-test.exp     |  2 ++
 .../modules.70-maint/375-variant-whatis.exp   |  2 ++
 .../modules.70-maint/376-variant-tag.exp      |  2 ++
 .../modules.70-maint/377-variant-shortcut.exp |  2 ++
 testsuite/modules.70-maint/380-edit.exp       |  2 ++
 62 files changed, 143 insertions(+), 7 deletions(-)

diff --git a/testsuite/modules.70-maint/030-purge.exp b/testsuite/modules.70-maint/030-purge.exp
index 570bccde..a03bf4b8 100644
--- a/testsuite/modules.70-maint/030-purge.exp
+++ b/testsuite/modules.70-maint/030-purge.exp
@@ -52,6 +52,8 @@ test_cmd "csh" "purge" $ans
 # command nickname tests
 test_cmd "csh" "pu" $ans
 
+skip_if_quick_mode
+
 
 # setup LOADEDMODULES/_LMFILES_ with an empty element
 setenv_loaded_module [list {} $module] [list {} $modulefile]
diff --git a/testsuite/modules.70-maint/040-list.exp b/testsuite/modules.70-maint/040-list.exp
index db9882a6..2c3a19c2 100644
--- a/testsuite/modules.70-maint/040-list.exp
+++ b/testsuite/modules.70-maint/040-list.exp
@@ -52,6 +52,8 @@ testouterr_cmd "csh" "list" "OK" "$ts_csh_num"
 # command nickname tests
 testouterr_cmd "csh" "li" "OK" "$ts_csh_num"
 
+skip_if_quick_mode
+
 # setup MODULEPATH with a trailing slash and an empty dir element
 setenv_path_var MODULEPATH {} "$modpath/"
 testouterr_cmd "csh" "--terse list" "OK" "$ts_csh"
diff --git a/testsuite/modules.70-maint/045-listlong.exp b/testsuite/modules.70-maint/045-listlong.exp
index 94e54159..b529f779 100644
--- a/testsuite/modules.70-maint/045-listlong.exp
+++ b/testsuite/modules.70-maint/045-listlong.exp
@@ -53,6 +53,7 @@ setenv_loaded_module $module/$version $modulefile
 
 testouterr_cmd_re "csh" "--long list" "OK" "$ts_csh"
 
+skip_if_quick_mode
 
 #
 #  Set up the environment pointing to module file holding tags
diff --git a/testsuite/modules.70-maint/050-whatis-load.exp b/testsuite/modules.70-maint/050-whatis-load.exp
index d8bb9255..17f77f6d 100644
--- a/testsuite/modules.70-maint/050-whatis-load.exp
+++ b/testsuite/modules.70-maint/050-whatis-load.exp
@@ -22,6 +22,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # ensure auto symbolic versions are not set for these tests
 setenv_var MODULES_ADVANCED_VERSION_SPEC 0
 
diff --git a/testsuite/modules.70-maint/055-whatis.exp b/testsuite/modules.70-maint/055-whatis.exp
index 986d6b54..f131b62b 100644
--- a/testsuite/modules.70-maint/055-whatis.exp
+++ b/testsuite/modules.70-maint/055-whatis.exp
@@ -65,6 +65,9 @@ set ts_csh_7 "$header\n$whatis_7: erroneous module test"
 testouterr_cmd_re "csh" "--terse whatis $module_1" "OK" "$ts_csh_1"
 testouterr_cmd_re "csh" "--terse whatis $module_2" "OK" "$ts_csh_2"
 testouterr_cmd_re "csh" "--terse whatis $module_3" "OK" "$ts_csh_3"
+
+skip_if_quick_mode
+
 testouterr_cmd_re "csh" "--terse whatis $module_4" "OK" "$ts_csh_4"
 testouterr_cmd_re "csh" "--terse whatis $module_5" "OK" "$ts_csh_5"
 
diff --git a/testsuite/modules.70-maint/056-whatis-nullpath.exp b/testsuite/modules.70-maint/056-whatis-nullpath.exp
index 96ec4bf4..2f5c4b09 100644
--- a/testsuite/modules.70-maint/056-whatis-nullpath.exp
+++ b/testsuite/modules.70-maint/056-whatis-nullpath.exp
@@ -23,6 +23,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # force MODULEPATH with "empty" value.
 setenv_path_var MODULEPATH foo {} bar
 
diff --git a/testsuite/modules.70-maint/060-apropos.exp b/testsuite/modules.70-maint/060-apropos.exp
index b0c5e427..8303f26e 100644
--- a/testsuite/modules.70-maint/060-apropos.exp
+++ b/testsuite/modules.70-maint/060-apropos.exp
@@ -52,6 +52,9 @@ set ts_7  "           bad2/proc: erroneous module test"
 # expect a break message
 # error found in interpreted module, so an error code is rendered
 testouterr_cmd_re "csh" "apropos Whatis" "ERR" "$header\n$ts_1\n$ts_1a\n$ts_2\n$ts_4"
+
+skip_if_quick_mode
+
 # different behavior than C-version: on Tcl-version -i/--icase option is ignored
 # but search is always case insensitive
 testouterr_cmd_re "csh" "apropos WHATIS" "ERR" "$header\n$ts_1\n$ts_1a\n$ts_2\n$ts_4"
diff --git a/testsuite/modules.70-maint/070-display.exp b/testsuite/modules.70-maint/070-display.exp
index c8658cd4..61fa5387 100644
--- a/testsuite/modules.70-maint/070-display.exp
+++ b/testsuite/modules.70-maint/070-display.exp
@@ -179,6 +179,8 @@ setenv\t\ttestsuite yes
 
 testouterr_cmd_re "csh" "display $module_1" "OK" "$out_pat"
 
+skip_if_quick_mode
+
 # command nickname tests
 testouterr_cmd_re "csh" "show $module_1" "OK" "$out_pat"
 testouterr_cmd_re "csh" "di $module_1" "OK" "$out_pat"
diff --git a/testsuite/modules.70-maint/080-help.exp b/testsuite/modules.70-maint/080-help.exp
index 0cfd5d2e..35b45d22 100644
--- a/testsuite/modules.70-maint/080-help.exp
+++ b/testsuite/modules.70-maint/080-help.exp
@@ -106,6 +106,9 @@ set out_err_4 "$err_path'$module_4'"
 
 # test stderr output
 testouterr_cmd_re "sh" "help $module" "OK" "$err_help"
+
+skip_if_quick_mode
+
 # test with module passed as full path
 if {$plus_in_modpath && $install_advversspec eq {y}} {
     setenv_var MODULES_ADVANCED_VERSION_SPEC 0
diff --git a/testsuite/modules.70-maint/085-test.exp b/testsuite/modules.70-maint/085-test.exp
index cb7f0445..5df0cb41 100644
--- a/testsuite/modules.70-maint/085-test.exp
+++ b/testsuite/modules.70-maint/085-test.exp
@@ -75,6 +75,9 @@ set mod6_err "$err_path'$module6'"
 
 # missing procedure
 testouterr_cmd_re "sh" "test $module" "OK" "$modlin\n$lin_test$modulefile:\n\n$missing_test$modulefile.\n$modlin"
+
+skip_if_quick_mode
+
 # test with module passed as full path
 if {$plus_in_modpath && $install_advversspec eq {y}} {
     setenv_var MODULES_ADVANCED_VERSION_SPEC 0
diff --git a/testsuite/modules.70-maint/090-source.exp b/testsuite/modules.70-maint/090-source.exp
index c68f46ae..c9101081 100644
--- a/testsuite/modules.70-maint/090-source.exp
+++ b/testsuite/modules.70-maint/090-source.exp
@@ -41,6 +41,8 @@ set err_csh2 [msg_moderr "$msg_invcmdname \"bad-command\"" {bad-command} $module
 #
 testouterr_cmd "csh" "source $module_1" $ans ""
 
+skip_if_quick_mode
+
 #
 #  test sourcing rc file with no module-specific magic cookie
 #
diff --git a/testsuite/modules.70-maint/100-path.exp b/testsuite/modules.70-maint/100-path.exp
index 8927d296..7bf1ced3 100644
--- a/testsuite/modules.70-maint/100-path.exp
+++ b/testsuite/modules.70-maint/100-path.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # skip tests if implicit_default option could not be overridden
 if {[is_config_locked implicit_default]} {
     send_user "\tskipping tests as implicit_default could not be overridden\n"
diff --git a/testsuite/modules.70-maint/110-paths.exp b/testsuite/modules.70-maint/110-paths.exp
index 10f2fafd..61e9d4e9 100644
--- a/testsuite/modules.70-maint/110-paths.exp
+++ b/testsuite/modules.70-maint/110-paths.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 #
 #  Test variables
 #
diff --git a/testsuite/modules.70-maint/120-autoinit.exp b/testsuite/modules.70-maint/120-autoinit.exp
index 12b0a0a5..6b9a16f3 100644
--- a/testsuite/modules.70-maint/120-autoinit.exp
+++ b/testsuite/modules.70-maint/120-autoinit.exp
@@ -596,6 +596,8 @@ foreach set_shell_startup [list {} 0 1] {
     unsetenv_var MODULES_SET_SHELL_STARTUP
 }
 
+skip_if_quick_mode
+
 # test versioning autoinit when MODULE_VERSION is already defined
 if {$install_versioning eq "y"} {
     # setup environment state
diff --git a/testsuite/modules.70-maint/130-aliases.exp b/testsuite/modules.70-maint/130-aliases.exp
index 2d0efa08..f459e5b5 100644
--- a/testsuite/modules.70-maint/130-aliases.exp
+++ b/testsuite/modules.70-maint/130-aliases.exp
@@ -134,6 +134,8 @@ use/default -> use/1.0"
 
 testouterr_cmd_re "sh" "aliases" "OK" "$alias_header\n$alias_list\n\n$version_header\n$version_list"
 
+skip_if_quick_mode
+
 # command nickname tests
 testouterr_cmd_re "sh" "al" "OK" "$alias_header\n$alias_list\n\n$version_header\n$version_list"
 
diff --git a/testsuite/modules.70-maint/140-multiargs.exp b/testsuite/modules.70-maint/140-multiargs.exp
index ec094737..ec55514e 100644
--- a/testsuite/modules.70-maint/140-multiargs.exp
+++ b/testsuite/modules.70-maint/140-multiargs.exp
@@ -20,6 +20,7 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
 
 set mod_g1 "append/2.0"
 set modfile_g1 "$modpath/$mod_g1"
diff --git a/testsuite/modules.70-maint/150-append-path.exp b/testsuite/modules.70-maint/150-append-path.exp
index 515fbc79..e26731b8 100644
--- a/testsuite/modules.70-maint/150-append-path.exp
+++ b/testsuite/modules.70-maint/150-append-path.exp
@@ -36,6 +36,7 @@ lappend ans [list set FOO_modshare "$path1:1"]
 
 testouterr_cmd_re "sh" "append-path FOO $path1" $ans ""
 
+skip_if_quick_mode
 
 if { $verbose > 0 } {
     send_user "\tSetup FOO = '$path1'\n"
diff --git a/testsuite/modules.70-maint/151-prepend-path.exp b/testsuite/modules.70-maint/151-prepend-path.exp
index b8a83970..ee386ba8 100644
--- a/testsuite/modules.70-maint/151-prepend-path.exp
+++ b/testsuite/modules.70-maint/151-prepend-path.exp
@@ -36,6 +36,7 @@ lappend ans [list set FOO_modshare "$path1:1"]
 
 testouterr_cmd_re "sh" "prepend-path FOO $path1" $ans ""
 
+skip_if_quick_mode
 
 if { $verbose > 0 } {
     send_user "\tSetup FOO = '$path1'\n"
diff --git a/testsuite/modules.70-maint/152-remove-path.exp b/testsuite/modules.70-maint/152-remove-path.exp
index 48681ab3..b7129fb2 100644
--- a/testsuite/modules.70-maint/152-remove-path.exp
+++ b/testsuite/modules.70-maint/152-remove-path.exp
@@ -33,6 +33,7 @@ lappend ans [list unset FOO]
 
 testouterr_cmd_re "sh" "remove-path FOO $path1" $ans ""
 
+skip_if_quick_mode
 
 setenv_path_var FOO $path1
 
diff --git a/testsuite/modules.70-maint/153-is-loaded.exp b/testsuite/modules.70-maint/153-is-loaded.exp
index 649d8714..acfe8841 100644
--- a/testsuite/modules.70-maint/153-is-loaded.exp
+++ b/testsuite/modules.70-maint/153-is-loaded.exp
@@ -28,6 +28,9 @@ set modulefile_reld "$reldmodpath/$module"
 set modulefile_reldd "$relddmodpath/$module"
 
 testouterr_cmd "ALL" "is-loaded $module" "ERR" ""
+
+skip_if_quick_mode
+
 testouterr_cmd "sh" "is-loaded" "ERR" ""
 testouterr_cmd "sh" "is-loaded $modname foo" "ERR" ""
 testouterr_cmd "sh" "is-loaded foo $modpart" "ERR" ""
diff --git a/testsuite/modules.70-maint/154-is-saved.exp b/testsuite/modules.70-maint/154-is-saved.exp
index 0578d28d..aef2440f 100644
--- a/testsuite/modules.70-maint/154-is-saved.exp
+++ b/testsuite/modules.70-maint/154-is-saved.exp
@@ -34,6 +34,9 @@ set env(HOME) "$homewithcoll"
 
 testouterr_cmd "ALL" "is-saved foo" "ERR" ""
 testouterr_cmd "ALL" "is-saved foo coll1" "OK" ""
+
+skip_if_quick_mode
+
 testouterr_cmd "sh" "is-saved" "OK" ""
 
 # define a collection target
diff --git a/testsuite/modules.70-maint/155-is-used.exp b/testsuite/modules.70-maint/155-is-used.exp
index 042e00d9..e6abdcad 100644
--- a/testsuite/modules.70-maint/155-is-used.exp
+++ b/testsuite/modules.70-maint/155-is-used.exp
@@ -28,6 +28,8 @@ testouterr_cmd "ALL" "is-used foo" "ERR" ""
 testouterr_cmd "ALL" "is-used foo $modpath" "OK" ""
 testouterr_cmd "sh" "is-used" "OK" ""
 
+skip_if_quick_mode
+
 # empty modulepath
 unsetenv_path_var MODULEPATH
 
diff --git a/testsuite/modules.70-maint/157-info-loaded.exp b/testsuite/modules.70-maint/157-info-loaded.exp
index 2906e9c6..94d94cfd 100644
--- a/testsuite/modules.70-maint/157-info-loaded.exp
+++ b/testsuite/modules.70-maint/157-info-loaded.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set module "info"
 set module1 "$module/loaded"
 set modulefile1 "$modpath/$module1"
diff --git a/testsuite/modules.70-maint/170-contact.exp b/testsuite/modules.70-maint/170-contact.exp
index de6837af..a0aceab5 100644
--- a/testsuite/modules.70-maint/170-contact.exp
+++ b/testsuite/modules.70-maint/170-contact.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # skip tests if implicit_default option could not be overridden
 if {[is_config_locked implicit_default]} {
     send_user "\tskipping tests as implicit_default could not be overridden\n"
diff --git a/testsuite/modules.70-maint/180-reload.exp b/testsuite/modules.70-maint/180-reload.exp
index 988826c9..1cf08921 100644
--- a/testsuite/modules.70-maint/180-reload.exp
+++ b/testsuite/modules.70-maint/180-reload.exp
@@ -48,6 +48,8 @@ setenv_loaded_module $module $modulefile
 
 test_cmd "sh" "reload" $ans
 
+skip_if_quick_mode
+
 # command nickname tests
 test_cmd "sh" "rel" $ans
 test_cmd "sh" "ref" $ans
diff --git a/testsuite/modules.70-maint/190-emptyarg.exp b/testsuite/modules.70-maint/190-emptyarg.exp
index 43af65a9..0195807d 100644
--- a/testsuite/modules.70-maint/190-emptyarg.exp
+++ b/testsuite/modules.70-maint/190-emptyarg.exp
@@ -25,6 +25,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set module1 "/path/to/mod1"
 set modulefile1 "$module1"
 set module2 "loc_dv1/1.0"
diff --git a/testsuite/modules.70-maint/200-errdisp.exp b/testsuite/modules.70-maint/200-errdisp.exp
index 77da67d0..b2d93e60 100644
--- a/testsuite/modules.70-maint/200-errdisp.exp
+++ b/testsuite/modules.70-maint/200-errdisp.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set test_cols 20
 if {![info exists term_cols]} {
     # skip tests if current terminal witdh is unknown
diff --git a/testsuite/modules.70-maint/210-clear.exp b/testsuite/modules.70-maint/210-clear.exp
index eb5382c0..3e4246b4 100644
--- a/testsuite/modules.70-maint/210-clear.exp
+++ b/testsuite/modules.70-maint/210-clear.exp
@@ -43,6 +43,8 @@ foreach str [list y Y yes YES Yes yESfoo] {
     testouterr_cmd sh "clear $str" $ans {}
 }
 
+skip_if_quick_mode
+
 # test valid confirmation passed via stdin
 foreach str [list y Y yes YES Yes yESfoo] {
     testinouterr_cmd sh {clear} $str $ans {}
diff --git a/testsuite/modules.70-maint/220-config.exp b/testsuite/modules.70-maint/220-config.exp
index 8202bb42..5d1f1cb3 100644
--- a/testsuite/modules.70-maint/220-config.exp
+++ b/testsuite/modules.70-maint/220-config.exp
@@ -175,19 +175,18 @@ array set configlockable [list\
 
 set statelist [list always_read_full_file autoinit clock_seconds cmdline commandname domainname error_count extra_siteconfig_loaded false_rendered force hiding_threshold inhibit_errreport inhibit_interp init_error_report is_stderr_tty is_win kernelversion lm_info_cached machine modulefile nodename os osversion paginate path_separator report_format reportfd return_false shell shelltype siteconfig_loaded sub1_separator sub2_separator subcmd subcmd_args tcl_ext_lib_loaded tcl_version tcl_version_lt85 term_columns usergroups username]
 
+if {[is_quick_mode]} {
+    array unset configdfl
+    array set configdfl [list\
+        advanced_version_spec     [expr {$install_advversspec eq {y}}]
+    ]
+}
 
 # single config parameter report
 foreach param [array names configdfl] {
     testouterr_cmd_re sh "config $param" OK "$vers_reportre\n\n$config_header\n$param\\s+$configdfl($param)[if_configlocked $param { \(locked\)}]"
 }
 
-# test full config report
-set tserr "$vers_reportre\n\n$config_header"
-foreach param [lsort [array names configdfl]] {
-    append tserr "\n$param\\s+$configdfl($param)[if_configlocked $param { \(locked\)}]"
-}
-testouterr_cmd_re ALL config OK $tserr
-
 # unknown parameter report
 testouterr_cmd_re sh {config foo} ERR "$error_msgs: Configuration option 'foo' does not exist"
 
@@ -202,6 +201,15 @@ foreach param [array names configdfl] {
     }
 }
 
+skip_if_quick_mode
+
+# test full config report
+set tserr "$vers_reportre\n\n$config_header"
+foreach param [lsort [array names configdfl]] {
+    append tserr "\n$param\\s+$configdfl($param)[if_configlocked $param { \(locked\)}]"
+}
+testouterr_cmd_re ALL config OK $tserr
+
 # set parameter that could be altered and whose value is checked
 foreach param [array names configvalid] {
     if {[info exists configvalidkind($param)]} {
diff --git a/testsuite/modules.70-maint/230-verbosity.exp b/testsuite/modules.70-maint/230-verbosity.exp
index d2fa30dd..bb334de3 100644
--- a/testsuite/modules.70-maint/230-verbosity.exp
+++ b/testsuite/modules.70-maint/230-verbosity.exp
@@ -46,6 +46,8 @@ setenv_var MODULES_VERBOSITY normal
 testouterr_cmd_re sh {load module/meta} $ans [msg_load trace/all_on $err_trace]\n\n[msg_top_load module/meta {} {setenv/1.0 trace/all_on prereq/module} {}]
 testouterr_cmd_re sh {load -v module/meta} $ans [msg_load setenv/1.0]\n\n[msg_load trace/all_on $err_trace]\n\n[msg_load prereq/module]\n\n[msg_top_load module/meta {} {setenv/1.0 trace/all_on prereq/module} {}]
 
+skip_if_quick_mode
+
 # for the other tests, just set the MODULES_VERBOSITY variable to selected verbosity level
 foreach verbosity [list silent concise normal verbose verbose2] {
     setenv_var MODULES_VERBOSITY $verbosity
diff --git a/testsuite/modules.70-maint/231-verbose2.exp b/testsuite/modules.70-maint/231-verbose2.exp
index 20eedbb3..a1ac8f8a 100644
--- a/testsuite/modules.70-maint/231-verbose2.exp
+++ b/testsuite/modules.70-maint/231-verbose2.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/240-icase.exp b/testsuite/modules.70-maint/240-icase.exp
index 4df4c76f..6bfae375 100644
--- a/testsuite/modules.70-maint/240-icase.exp
+++ b/testsuite/modules.70-maint/240-icase.exp
@@ -80,6 +80,8 @@ testouterr_cmd_re sh {whatis NOCASE2} OK $tserrw1
 testouterr_cmd sh {paths NOCASE2} $ansp1 {}
 testouterr_cmd sh {load NOCASE2} $ans1 {}
 
+skip_if_quick_mode
+
 # default option value
 setenv_var MODULES_ICASE badvalue
 switch -- $install_icase {
diff --git a/testsuite/modules.70-maint/250-nan.exp b/testsuite/modules.70-maint/250-nan.exp
index 8cf02a58..0abbbbfc 100644
--- a/testsuite/modules.70-maint/250-nan.exp
+++ b/testsuite/modules.70-maint/250-nan.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp "$modpath.2"
 set mpre "$modpathre.2"
 
diff --git a/testsuite/modules.70-maint/260-extended_default.exp b/testsuite/modules.70-maint/260-extended_default.exp
index 3bcfe434..9e33cbc7 100644
--- a/testsuite/modules.70-maint/260-extended_default.exp
+++ b/testsuite/modules.70-maint/260-extended_default.exp
@@ -69,6 +69,8 @@ switch -- $install_extendeddefault {
     y {testouterr_cmd sh {path extdfl2/3} $ans {}}
 }
 
+skip_if_quick_mode
+
 
 # enable extended_default for next tests
 setenv_var MODULES_EXTENDED_DEFAULT 1
diff --git a/testsuite/modules.70-maint/270-adv_version_spec.exp b/testsuite/modules.70-maint/270-adv_version_spec.exp
index ce7e0b3d..92dd1d47 100644
--- a/testsuite/modules.70-maint/270-adv_version_spec.exp
+++ b/testsuite/modules.70-maint/270-adv_version_spec.exp
@@ -66,6 +66,8 @@ switch -- $install_advversspec {
     y {testouterr_cmd sh {path extdfl@2.0} $ans {}}
 }
 
+skip_if_quick_mode
+
 
 # enable advanced version spec for next tests
 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
diff --git a/testsuite/modules.70-maint/271-adv_version_spec-in.exp b/testsuite/modules.70-maint/271-adv_version_spec-in.exp
index d3c03e22..88336745 100644
--- a/testsuite/modules.70-maint/271-adv_version_spec-in.exp
+++ b/testsuite/modules.70-maint/271-adv_version_spec-in.exp
@@ -66,6 +66,8 @@ switch -- $install_advversspec {
     y {testouterr_cmd sh {path extdfl@1.4.5,2.0} $ans {}}
 }
 
+skip_if_quick_mode
+
 
 # enable advanced version spec for next tests
 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
diff --git a/testsuite/modules.70-maint/272-adv_version_spec-range.exp b/testsuite/modules.70-maint/272-adv_version_spec-range.exp
index d58bb090..520a5805 100644
--- a/testsuite/modules.70-maint/272-adv_version_spec-range.exp
+++ b/testsuite/modules.70-maint/272-adv_version_spec-range.exp
@@ -63,6 +63,8 @@ switch -- $install_advversspec {
     y {testouterr_cmd sh {path extdfl@:2.0} $ans {}}
 }
 
+skip_if_quick_mode
+
 
 # enable advanced version spec for next tests
 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
diff --git a/testsuite/modules.70-maint/273-adv_version_spec-space.exp b/testsuite/modules.70-maint/273-adv_version_spec-space.exp
index 2e76fa9c..266b12e2 100644
--- a/testsuite/modules.70-maint/273-adv_version_spec-space.exp
+++ b/testsuite/modules.70-maint/273-adv_version_spec-space.exp
@@ -21,6 +21,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # ensure avail -t tests have implicit default enabled
 setenv_var MODULES_IMPLICIT_DEFAULT 1
 
diff --git a/testsuite/modules.70-maint/274-adv_version_spec-autosym.exp b/testsuite/modules.70-maint/274-adv_version_spec-autosym.exp
index b3086ffc..c8488f68 100644
--- a/testsuite/modules.70-maint/274-adv_version_spec-autosym.exp
+++ b/testsuite/modules.70-maint/274-adv_version_spec-autosym.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # ensure avail -t tests have implicit default enabled
 setenv_var MODULES_IMPLICIT_DEFAULT 1
 
diff --git a/testsuite/modules.70-maint/275-adv_version_spec-loaded.exp b/testsuite/modules.70-maint/275-adv_version_spec-loaded.exp
index 08e159a2..cfb14cde 100644
--- a/testsuite/modules.70-maint/275-adv_version_spec-loaded.exp
+++ b/testsuite/modules.70-maint/275-adv_version_spec-loaded.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 # ensure tests have implicit default enabled
 setenv_var MODULES_IMPLICIT_DEFAULT 1
 
diff --git a/testsuite/modules.70-maint/276-adv_version_spec-rangein.exp b/testsuite/modules.70-maint/276-adv_version_spec-rangein.exp
index e057401d..1a57e66d 100644
--- a/testsuite/modules.70-maint/276-adv_version_spec-rangein.exp
+++ b/testsuite/modules.70-maint/276-adv_version_spec-rangein.exp
@@ -62,6 +62,9 @@ advvers2/5.1
 advvers2/5.2
 advvers2/5.3"
 testouterr_cmd sh {avail -t advvers2@1.3:2.1,3.2,4:5} OK $tserr
+
+skip_if_quick_mode
+
 set tserr "$mp:\nadvvers2/1.0
 advvers2/1.1
 advvers2/1.2
diff --git a/testsuite/modules.70-maint/280-ml.exp b/testsuite/modules.70-maint/280-ml.exp
index 821d7a2f..71c86e23 100644
--- a/testsuite/modules.70-maint/280-ml.exp
+++ b/testsuite/modules.70-maint/280-ml.exp
@@ -57,6 +57,8 @@ testouterr_cmd sh {ml lo extdfl} $ans {}
 set tserr $no_loaded
 testouterr_cmd sh {ml} OK $tserr
 
+skip_if_quick_mode
+
 # trigger usage message
 set tserr "$vers_reportre\nUsage: ml .*See 'module --help' to get available commands and options."
 testouterr_cmd_re sh {ml -h} OK $tserr
diff --git a/testsuite/modules.70-maint/290-json.exp b/testsuite/modules.70-maint/290-json.exp
index c230426d..50b3129e 100644
--- a/testsuite/modules.70-maint/290-json.exp
+++ b/testsuite/modules.70-maint/290-json.exp
@@ -55,6 +55,9 @@ testouterr_cmd sh {whatis nocase/ --json} OK "{\"$mp\": {
 \"nocase/regular\": { \"name\": \"nocase/regular\", \"whatis\": \[ \"nocase/regular\" \]},
 \"nocase/virt\": { \"name\": \"nocase/virt\", \"whatis\": \[ \"nocase/virt\" \]}
 }}"
+
+skip_if_quick_mode
+
 # newline in result comes from a modulefile that directly puts to stderr during its search evaluation
 testouterr_cmd sh {search nocase/ --json} ERR "{\n\"$mp\": {
 \"nocase/1\": { \"name\": \"nocase/1\", \"whatis\": \[ \"nocase/1\" \]},
diff --git a/testsuite/modules.70-maint/300-err_stack.exp b/testsuite/modules.70-maint/300-err_stack.exp
index 562601f1..0bbbceac 100644
--- a/testsuite/modules.70-maint/300-err_stack.exp
+++ b/testsuite/modules.70-maint/300-err_stack.exp
@@ -34,6 +34,8 @@ set custom {    (procedure "good-command" line 2)
 set tserr [msg_load bad3/bodyproc [msg_moderr "$msg_invcmdname \"bad-command\"" bad-command $mp/bad3/bodyproc 6 {} {} {} $custom]]
 testouterr_cmd sh "load bad3/bodyproc" ERR $tserr
 
+skip_if_quick_mode
+
 set custom "    (procedure \"good-command\" line 2)
     invoked from within
 \"good-command\"
diff --git a/testsuite/modules.70-maint/310-sh-to-mod.exp b/testsuite/modules.70-maint/310-sh-to-mod.exp
index c7aa5f11..2e5ce480 100644
--- a/testsuite/modules.70-maint/310-sh-to-mod.exp
+++ b/testsuite/modules.70-maint/310-sh-to-mod.exp
@@ -160,6 +160,9 @@ if {[info exists shell_pathname(sh)]} {
         testouterr_shtomod sh {} OK "#%Module\n$tscwd\n$tsvarpre\n$tsalias_sh\n$tsfunc_sh\n$tsvar"
     }
 }
+
+skip_if_quick_mode
+
 if {[info exists shell_pathname(dash)]} {
     testouterr_shtomod dash {} OK "#%Module\n$tscwd\n$tsvarpre\n$tsalias_dash\n$tsvar"
 }
diff --git a/testsuite/modules.70-maint/320-tags.exp b/testsuite/modules.70-maint/320-tags.exp
index df4615ca..c8b4e191 100644
--- a/testsuite/modules.70-maint/320-tags.exp
+++ b/testsuite/modules.70-maint/320-tags.exp
@@ -132,6 +132,8 @@ set tserr "{\"tag/4.0\": { \"name\": \"tag/4.0\", \"type\": \"modulefile\", \"va
 \"tag/2.0\": { \"name\": \"tag/2.0\", \"type\": \"modulefile\", \"variants\": {}, \"symbols\": \[\], \"tags\": \[ \"forbidden\" \], \"pathname\": \"$mp/tag/1.0\"}}"
 testouterr_cmd sh {list -j} OK $tserr
 
+skip_if_quick_mode
+
 # display hidden entries
 testouterr_cmd sh {list -a} OK "$cur_loaded
  1) tag/4.0 <nF:othertag>   2) tag/2.0 <F>   3) tag/5.0 <H>  
diff --git a/testsuite/modules.70-maint/321-tag_abbrev.exp b/testsuite/modules.70-maint/321-tag_abbrev.exp
index 3a94ba2c..a4a0839f 100644
--- a/testsuite/modules.70-maint/321-tag_abbrev.exp
+++ b/testsuite/modules.70-maint/321-tag_abbrev.exp
@@ -42,6 +42,8 @@ tag/6.0 <BaR:F>
 tag/7.0"
 testouterr_cmd sh {avail -t tag@5:7} OK $tserr
 
+skip_if_quick_mode
+
 set ans [list]
 lappend ans [list setpath LOADEDMODULES tag/5.0]
 lappend ans [list setpath _LMFILES_ $mp/tag/5.0]
diff --git a/testsuite/modules.70-maint/322-tag-sgr.exp b/testsuite/modules.70-maint/322-tag-sgr.exp
index 3ffba234..42af80f7 100644
--- a/testsuite/modules.70-maint/322-tag-sgr.exp
+++ b/testsuite/modules.70-maint/322-tag-sgr.exp
@@ -54,6 +54,8 @@ testerr_cmd_re sh {list} "$cur_loaded
 Key:
 [sgr 100]auto-loaded[sgr 0]  <module-tag>  <O>=foo  "
 
+skip_if_quick_mode
+
 setenv_var MODULES_COLORS {auto-loaded=100}
 testerr_cmd_re sh {list} "$cur_loaded
  1\\) tag/5.0 <aL:BaR:O>  
diff --git a/testsuite/modules.70-maint/330-large-file.exp b/testsuite/modules.70-maint/330-large-file.exp
index d0d8c630..77280d40 100644
--- a/testsuite/modules.70-maint/330-large-file.exp
+++ b/testsuite/modules.70-maint/330-large-file.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre [regsub -all "\(\[.+?\]\)" $mp {\\\1}]
 
diff --git a/testsuite/modules.70-maint/340-output-key.exp b/testsuite/modules.70-maint/340-output-key.exp
index c0b08189..d25db5c0 100644
--- a/testsuite/modules.70-maint/340-output-key.exp
+++ b/testsuite/modules.70-maint/340-output-key.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre [regsub -all "\(\[.+?\]\)" $mp {\\\1}]
 
diff --git a/testsuite/modules.70-maint/350-term_width.exp b/testsuite/modules.70-maint/350-term_width.exp
index ccc293b5..c4cfd463 100644
--- a/testsuite/modules.70-maint/350-term_width.exp
+++ b/testsuite/modules.70-maint/350-term_width.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set test_cols 169
 if {![info exists term_cols]} {
     # skip tests if current terminal witdh is unknown
diff --git a/testsuite/modules.70-maint/360-avail_output.exp b/testsuite/modules.70-maint/360-avail_output.exp
index ee7e3047..974a8cf5 100644
--- a/testsuite/modules.70-maint/360-avail_output.exp
+++ b/testsuite/modules.70-maint/360-avail_output.exp
@@ -47,6 +47,9 @@ setenv_var TESTSUITE_AVAIL_OUTPUT_FOO_SYM 1
 set tserr_avail_foo "foo/1.0\\(bar\\)  "
 set tserr_avail_terse_foo "foo/1.0\\(bar\\)"
 testouterr_cmd_re sh {avail -o sym foo/1.0} OK $tserr_avail_foo
+
+skip_if_quick_mode
+
 testouterr_cmd sh {avail foo -o} ERR "$error_msgs: Missing value for '-o' option\n$err_typehelp"
 testouterr_cmd_re sh {avail --output=sym foo/1.0} OK $tserr_avail_foo
 testouterr_cmd sh {avail --output foo} ERR "$error_msgs: Missing value for '--output' option\n$err_typehelp"
diff --git a/testsuite/modules.70-maint/361-list_output.exp b/testsuite/modules.70-maint/361-list_output.exp
index 122fa323..5c69fdf3 100644
--- a/testsuite/modules.70-maint/361-list_output.exp
+++ b/testsuite/modules.70-maint/361-list_output.exp
@@ -46,6 +46,9 @@ setenv_path_var MODULES_LMALTNAME foo/1.0&foo/bar
 set tserr_list_foo "foo/1.0(bar)  "
 set tserr_list_terse_foo "foo/1.0(bar)"
 testouterr_cmd sh {list -o sym} OK $tserr_list_foo
+
+skip_if_quick_mode
+
 testouterr_cmd sh {list -o} ERR "$error_msgs: Missing value for '-o' option\n$err_typehelp"
 testouterr_cmd sh {list --output=sym} OK $tserr_list_foo
 testouterr_cmd sh {list --output} ERR "$error_msgs: Missing value for '--output' option\n$err_typehelp"
diff --git a/testsuite/modules.70-maint/370-variant.exp b/testsuite/modules.70-maint/370-variant.exp
index 318e57de..1e093b3c 100644
--- a/testsuite/modules.70-maint/370-variant.exp
+++ b/testsuite/modules.70-maint/370-variant.exp
@@ -41,6 +41,8 @@ testouterr_cmd sh {list} OK "$cur_loaded
 Key:
 {variant=value}  "
 
+skip_if_quick_mode
+
 testouterr_cmd sh {list -o header:idx:sym:tag:key} OK "$cur_loaded
  1) variant/1.0  "
 
diff --git a/testsuite/modules.70-maint/371-variant-msg.exp b/testsuite/modules.70-maint/371-variant-msg.exp
index e6b42896..7e3b6732 100644
--- a/testsuite/modules.70-maint/371-variant-msg.exp
+++ b/testsuite/modules.70-maint/371-variant-msg.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/372-variant-display.exp b/testsuite/modules.70-maint/372-variant-display.exp
index cdf29846..79e24acc 100644
--- a/testsuite/modules.70-maint/372-variant-display.exp
+++ b/testsuite/modules.70-maint/372-variant-display.exp
@@ -41,6 +41,8 @@ append-path\tTS2 bar-foo
 $modlin"
 testouterr_cmd_re sh {display variant/4.0 foo=val1 bar=2} OK $tserr
 
+skip_if_quick_mode
+
 # no variant value
 set tserr "$modlin
 $mpre/variant/4.0:
diff --git a/testsuite/modules.70-maint/373-variant-help.exp b/testsuite/modules.70-maint/373-variant-help.exp
index e16a17c5..572926a0 100644
--- a/testsuite/modules.70-maint/373-variant-help.exp
+++ b/testsuite/modules.70-maint/373-variant-help.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/374-variant-test.exp b/testsuite/modules.70-maint/374-variant-test.exp
index 54e097e0..b0a346c5 100644
--- a/testsuite/modules.70-maint/374-variant-test.exp
+++ b/testsuite/modules.70-maint/374-variant-test.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/375-variant-whatis.exp b/testsuite/modules.70-maint/375-variant-whatis.exp
index 1d62fa5b..f6879af6 100644
--- a/testsuite/modules.70-maint/375-variant-whatis.exp
+++ b/testsuite/modules.70-maint/375-variant-whatis.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/376-variant-tag.exp b/testsuite/modules.70-maint/376-variant-tag.exp
index 037f3497..2646bece 100644
--- a/testsuite/modules.70-maint/376-variant-tag.exp
+++ b/testsuite/modules.70-maint/376-variant-tag.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/377-variant-shortcut.exp b/testsuite/modules.70-maint/377-variant-shortcut.exp
index 51bd28d9..f4704bdd 100644
--- a/testsuite/modules.70-maint/377-variant-shortcut.exp
+++ b/testsuite/modules.70-maint/377-variant-shortcut.exp
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+skip_if_quick_mode
+
 set mp $modpath.3
 set mpre $modpathre.3
 setenv_path_var MODULEPATH $mp
diff --git a/testsuite/modules.70-maint/380-edit.exp b/testsuite/modules.70-maint/380-edit.exp
index 636eee84..032c844e 100644
--- a/testsuite/modules.70-maint/380-edit.exp
+++ b/testsuite/modules.70-maint/380-edit.exp
@@ -71,6 +71,8 @@ if {$install_editor ne {} && ![file exists $dfleditorpath]} {
     send_user "\tskipping default editor tests\n"
 }
 
+skip_if_quick_mode
+
 # inexistent module
 testouterr_cmd sh {edit unknown/3.0} ERR $err_path'unknown/3.0'