From 0689bb5bb96a3ffef86272c826d0439221a591df Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Tue, 20 Jul 2021 12:35:26 +0200
Subject: [PATCH] ts: use default conf names in example for tests

---
 .github/workflows/linux_tests.yaml             |  2 +-
 .gitignore                                     |  3 ++-
 Makefile                                       | 18 +++++++++---------
 .../example/{modulerc-1.in => initrc-1.in}     |  0
 .../{.modulespath-empty => modulespath-empty}  |  0
 ...modulespath-wild.in => modulespath-wild.in} |  0
 testsuite/modules.70-maint/120-autoinit.exp    |  4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)
 rename testsuite/example/{modulerc-1.in => initrc-1.in} (100%)
 rename testsuite/example/{.modulespath-empty => modulespath-empty} (100%)
 rename testsuite/example/{.modulespath-wild.in => modulespath-wild.in} (100%)

diff --git a/.github/workflows/linux_tests.yaml b/.github/workflows/linux_tests.yaml
index b48ffc66..65cdab19 100644
--- a/.github/workflows/linux_tests.yaml
+++ b/.github/workflows/linux_tests.yaml
@@ -115,7 +115,7 @@ jobs:
     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 --enable-set-shell-startup
       COVERAGE: y
-      EXTRA_SCRIPT_PRETEST: make install-testmodulerc-1 install-testetcrc install-testmodspath
+      EXTRA_SCRIPT_PRETEST: make install-testinitrc-1 install-testetcrc install-testmodspath
       EXTRA_SCRIPT_POSTTEST: make uninstall-testconfig
     steps:
       - uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
index 7ea848fe..6de37aa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,9 @@
 /contrib/modulefiles/modules
 /contrib/modulefiles/version
 /testsuite/example/.modulespath
+/testsuite/example/modulespath-wild
 /testsuite/example/modulerc
-/testsuite/example/modulerc-1
+/testsuite/example/initrc-1
 /testsuite/example/initrc
 /testsuite/.config
 /compat
diff --git a/Makefile b/Makefile
index 21528c92..8c3d1bac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: doc pkgdoc initdir install install-testsiteconfig \
-	install-testsiteconfig-1 install-testmodulerc install-testmodulerc-1 \
+	install-testsiteconfig-1 install-testmodulerc install-testinitrc-1 \
 	install-testinitrc install-testetcrc install-testmodspath \
 	install-testmodspath-empty install-testmodspath-wild \
 	uninstall-testconfig uninstall dist dist-tar dist-gzip dist-bzip2 \
@@ -425,13 +425,13 @@ lib/libtestutil-mktime$(SHLIB_SUFFIX):
 testsuite/example/.modulespath: testsuite/example/.modulespath.in
 	$(translate-in-script)
 
-testsuite/example/.modulespath-wild: testsuite/example/.modulespath-wild.in
+testsuite/example/modulespath-wild: testsuite/example/modulespath-wild.in
 	$(translate-in-script)
 
 testsuite/example/modulerc: testsuite/example/modulerc.in
 	$(translate-in-script)
 
-testsuite/example/modulerc-1: testsuite/example/modulerc-1.in
+testsuite/example/initrc-1: testsuite/example/initrc-1.in
 	$(translate-in-script)
 
 testsuite/example/initrc: testsuite/example/initrc.in
@@ -449,7 +449,7 @@ install-testmodulerc: testsuite/example/modulerc
 	$(MAKE) -C init install-testconfig DESTDIR=$(DESTDIR)
 	cp $^ $(DESTDIR)$(initrc)
 
-install-testmodulerc-1: testsuite/example/modulerc-1
+install-testinitrc-1: testsuite/example/initrc-1
 	$(MAKE) -C init install-testconfig DESTDIR=$(DESTDIR)
 	cp $^ $(DESTDIR)$(initrc)
 
@@ -465,11 +465,11 @@ install-testmodspath: testsuite/example/.modulespath
 	$(MAKE) -C init install-testconfig DESTDIR=$(DESTDIR)
 	cp $^ $(DESTDIR)$(modulespath)
 
-install-testmodspath-empty: testsuite/example/.modulespath-empty
+install-testmodspath-empty: testsuite/example/modulespath-empty
 	$(MAKE) -C init install-testconfig DESTDIR=$(DESTDIR)
 	cp $^ $(DESTDIR)$(modulespath)
 
-install-testmodspath-wild: testsuite/example/.modulespath-wild
+install-testmodspath-wild: testsuite/example/modulespath-wild
 	$(MAKE) -C init install-testconfig DESTDIR=$(DESTDIR)
 	cp $^ $(DESTDIR)$(modulespath)
 
@@ -678,7 +678,7 @@ endif
 	rm -f script/add.modules
 	rm -f script/gitlog2changelog.py
 	rm -f script/modulecmd
-	rm -f testsuite/example/.modulespath testsuite/example/.modulespath-wild testsuite/example/modulerc testsuite/example/modulerc-1 testsuite/example/initrc
+	rm -f testsuite/example/.modulespath testsuite/example/modulespath-wild testsuite/example/modulerc testsuite/example/initrc-1 testsuite/example/initrc
 	rm -f modules-*.tar modules-*.tar.gz modules-*.tar.bz2
 	rm -rf modules-*-win/
 	rm -f modules-*-win.zip
@@ -807,6 +807,6 @@ $(V).SILENT: initdir pkgdoc doc version.inc contrib/rpm/environment-modules.spec
 	lib/libtestutil-getgroups$(SHLIB_SUFFIX) lib/libtestutil-0getgroups$(SHLIB_SUFFIX) \
 	lib/libtestutil-dupgetgroups$(SHLIB_SUFFIX) lib/libtestutil-getgrgid$(SHLIB_SUFFIX) \
 	lib/libtestutil-time$(SHLIB_SUFFIX) lib/libtestutil-mktime$(SHLIB_SUFFIX) \
-	testsuite/example/.modulespath testsuite/example/.modulespath-wild \
-	testsuite/example/modulerc testsuite/example/modulerc-1 testsuite/example/initrc \
+	testsuite/example/.modulespath testsuite/example/modulespath-wild \
+	testsuite/example/modulerc testsuite/example/initrc-1 testsuite/example/initrc \
 	dist-tar dist-gzip dist-bzip2 dist-win $(MODULECMDTEST)
diff --git a/testsuite/example/modulerc-1.in b/testsuite/example/initrc-1.in
similarity index 100%
rename from testsuite/example/modulerc-1.in
rename to testsuite/example/initrc-1.in
diff --git a/testsuite/example/.modulespath-empty b/testsuite/example/modulespath-empty
similarity index 100%
rename from testsuite/example/.modulespath-empty
rename to testsuite/example/modulespath-empty
diff --git a/testsuite/example/.modulespath-wild.in b/testsuite/example/modulespath-wild.in
similarity index 100%
rename from testsuite/example/.modulespath-wild.in
rename to testsuite/example/modulespath-wild.in
diff --git a/testsuite/modules.70-maint/120-autoinit.exp b/testsuite/modules.70-maint/120-autoinit.exp
index aa385abe..12b0a0a5 100644
--- a/testsuite/modules.70-maint/120-autoinit.exp
+++ b/testsuite/modules.70-maint/120-autoinit.exp
@@ -69,8 +69,8 @@ if {[file readable $env(TESTSUITEDIR)/example/modulerc]} {
     set exmodrcdata [split [read $fid] "\n"]
     close $fid
 }
-if {[file readable $env(TESTSUITEDIR)/example/modulerc-1]} {
-    set fid [open $env(TESTSUITEDIR)/example/modulerc-1 r]
+if {[file readable $env(TESTSUITEDIR)/example/initrc-1]} {
+    set fid [open $env(TESTSUITEDIR)/example/initrc-1 r]
     set exmodrc1data [split [read $fid] "\n"]
     close $fid
 }