cirrus/gh: adapt setup following default config changes

Author: xdelaruelle

.cirrus.yml

@@ -134,7 +134,7 @@ task:
     # compatibility version-specific build requirements
     apt-get -y install automake autopoint
   configure_script:
-    - ./configure --with-tclsh=tclsh8.6 --prefix /tmp/modules --enable-compat-version --with-tcl=/usr/lib/tcl8.6 --with-tcl-ver=8.6 --without-tclx --enable-append-manpath --enable-append-binpath --with-bin-search-path=/usr/bin:/bin --disable-silent-shell-debug-support --enable-windows-support --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH --enable-color --with-dark-background-colors='hi=1:se=2:er=91:wa=93:mp=1;94:di=94:al=96:sy=95' --enable-foo FOO=bar
+    - ./configure --with-tclsh=tclsh8.6 --prefix /tmp/modules --enable-compat-version --with-tcl=/usr/lib/tcl8.6 --with-tcl-ver=8.6 --without-tclx --enable-append-manpath --enable-append-binpath --with-bin-search-path=/usr/bin:/bin --disable-silent-shell-debug-support --enable-windows-support --with-loadedmodules=null:dot --with-quarantine-vars=LD_LIBRARY_PATH --with-dark-background-colors='hi=1:se=2:er=91:wa=93:mp=1;94:di=94:al=96:sy=95' --enable-foo FOO=bar
   << : *BUILD_INSTALL_TEST_TEMPLATE
   << : *ARTIFACTS_TEMPLATE
 

.github/workflows/linux_tests.yaml

@@ -11,7 +11,7 @@ jobs:
   tcl86-nolibtclenvmodules:
     runs-on: ubuntu-18.04
     env:
-      CONFIGURE_OPTS: --with-tclsh=tclsh8.6 --disable-libtclenvmodules --prefix=/tmp/modules --with-pager=more --with-pager-opts=-X --enable-auto-handling
+      CONFIGURE_OPTS: --with-tclsh=tclsh8.6 --disable-libtclenvmodules --prefix=/tmp/modules --with-pager=more --with-pager-opts=-X --with-initconf-in=initdir
       COVERAGE: y
       EXTRA_SCRIPT_PRETEST: make install-testmodulerc install-testetcrc install-testmodspath-empty
       EXTRA_SCRIPT_POSTTEST: make uninstall-testconfig
@@ -61,7 +61,7 @@ jobs:
   tcl84-nolibtclenvmodules:
     runs-on: ubuntu-16.04
     env:
-      CONFIGURE_OPTS: --with-tclsh=tclsh8.4 --prefix=/tmp/modules --disable-libtclenvmodules --enable-compat-version --with-tcl=/usr/lib/tcl8.4 --enable-versioning --disable-silent-shell-debug-support --disable-set-shell-startup --disable-quarantine-support --with-initconf-in=etcdir --with-loadedmodules=null:dot --without-pager --disable-avail-indepth --with-terminal-background=light --with-unload-match-order=returnfirst --disable-implicit-default --with-search-match=contains --with-locked-configs=extra_siteconfig
+      CONFIGURE_OPTS: --with-tclsh=tclsh8.4 --prefix=/tmp/modules --disable-libtclenvmodules --enable-compat-version --with-tcl=/usr/lib/tcl8.4 --enable-versioning --disable-silent-shell-debug-support --disable-quarantine-support --with-loadedmodules=null:dot --without-pager --disable-avail-indepth --with-terminal-background=light --with-unload-match-order=returnfirst --disable-implicit-default --with-search-match=contains --with-locked-configs=extra_siteconfig --disable-auto-handling --disable-extended-default --disable-advanced-version-spec --disable-color --with-icase=never
       COVERAGE: y
       EXTRA_SCRIPT_PRETEST: make install-testinitrc install-testsiteconfig
       EXTRA_SCRIPT_POSTTEST: make uninstall-testconfig
@@ -113,7 +113,7 @@ jobs:
   tcl85:
     runs-on: ubuntu-18.04
     env:
-      CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --enable-compat-version --with-tcl=/usr/lib/tcl8.5 --disable-quarantine-support --enable-modulespath --with-pager=more --with-dark-background-colors=hi --with-locked-configs=implicit_default --enable-wa-277 --enable-advanced-version-spec --disable-ml --disable-implicit-requirement
+      CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --enable-compat-version --with-tcl=/usr/lib/tcl8.5 --disable-quarantine-support --enable-modulespath --with-pager=more --with-dark-background-colors=hi --with-locked-configs=implicit_default --enable-wa-277 --enable-advanced-version-spec --disable-ml --disable-implicit-requirement --enable-set-shell-startup
       COVERAGE: y
       EXTRA_SCRIPT_PRETEST: make install-testmodulerc-1 install-testetcrc install-testmodspath
       EXTRA_SCRIPT_POSTTEST: make uninstall-testconfig

testsuite/modules.70-maint/120-autoinit.exp

@@ -873,7 +873,9 @@ if {!$insmodspath && $initrc_exinstalled && $modrc eq "$install_etcdir/initrc"}
 
 # test precedence of etc/modulespath over init/.modulespath if we are purely testing
 # (as tests will modify the installation)
-if {$insmodspath && $modspath_exinstalled && $modspath eq "$install_etcdir/modulespath"} {
+# example modulerc/initrc files should not be installed to run the lock tests
+if {$insmodspath && $modspath_exinstalled && $modspath eq "$install_etcdir/modulespath"\
+    && !$modrc_exinstalled && !$modrc1_exinstalled && !$initrc_exinstalled} {
     # create a simple init/.modulespath
     set fid [open $install_initdir/.modulespath w]
     puts $fid {/unk}