Skip to content

Commit 53eb83e

Browse files
committed
ts: remove libtestutil-getgrgid
Now getgrgid failure is handled in a regular test case, there is no more need for a specific testutil getgrgid library. Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent 2012917 commit 53eb83e

7 files changed

Lines changed: 4 additions & 67 deletions

File tree

Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ TEST_PREREQ += lib/libtestutil-closedir$(SHLIB_SUFFIX) \
7272
lib/libtestutil-getgroups$(SHLIB_SUFFIX) \
7373
lib/libtestutil-0getgroups$(SHLIB_SUFFIX) \
7474
lib/libtestutil-dupgetgroups$(SHLIB_SUFFIX) \
75-
lib/libtestutil-getgrgid$(SHLIB_SUFFIX) \
7675
lib/libtestutil-time$(SHLIB_SUFFIX) \
7776
lib/libtestutil-mktime$(SHLIB_SUFFIX)
7877
endif
@@ -620,9 +619,6 @@ lib/libtestutil-0getgroups$(SHLIB_SUFFIX):
620619
lib/libtestutil-dupgetgroups$(SHLIB_SUFFIX):
621620
$(MAKE) --no-print-directory -C lib $(@F)
622621

623-
lib/libtestutil-getgrgid$(SHLIB_SUFFIX):
624-
$(MAKE) --no-print-directory -C lib $(@F)
625-
626622
lib/libtestutil-time$(SHLIB_SUFFIX):
627623
$(MAKE) --no-print-directory -C lib $(@F)
628624

@@ -1138,9 +1134,8 @@ $(V).SILENT: initdir pkgdoc doc version.inc share/rpm/environment-modules.spec \
11381134
script/gitlog2changelog.py script/modulecmd \
11391135
lib/libtclenvmodules$(SHLIB_SUFFIX) lib/libtestutil-closedir$(SHLIB_SUFFIX) \
11401136
lib/libtestutil-getpwuid$(SHLIB_SUFFIX) lib/libtestutil-getgroups$(SHLIB_SUFFIX) \
1141-
lib/libtestutil-0getgroups$(SHLIB_SUFFIX) \
1142-
lib/libtestutil-dupgetgroups$(SHLIB_SUFFIX) lib/libtestutil-getgrgid$(SHLIB_SUFFIX) \
1143-
lib/libtestutil-time$(SHLIB_SUFFIX) lib/libtestutil-mktime$(SHLIB_SUFFIX) \
1137+
lib/libtestutil-0getgroups$(SHLIB_SUFFIX) lib/libtestutil-mktime$(SHLIB_SUFFIX) \
1138+
lib/libtestutil-dupgetgroups$(SHLIB_SUFFIX) lib/libtestutil-time$(SHLIB_SUFFIX) \
11441139
testsuite/example/.modulespath testsuite/example/modulespath-wild \
11451140
testsuite/example/modulerc testsuite/example/initrc-1 testsuite/example/initrc \
11461141
dist-tar dist-gzip dist-bzip2 dist-win $(MODULECMDTEST) $(MODULECMDTEST)_i

lib/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
/libtestutil-getgroups.so
1515
/libtestutil-0getgroups.so
1616
/libtestutil-dupgetgroups.so
17-
/libtestutil-getgrgid.so
1817
/libtestutil-time.so
1918
/libtestutil-mktime.so
2019
/envmodules.c.gcov

lib/Makefile.in

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ libtestutil-dupgetgroups@SHLIB_SUFFIX@: testutil-dupgetgroups.c
5252
$(ECHO_CC)
5353
$(LDCC) $< -o $@
5454

55-
libtestutil-getgrgid@SHLIB_SUFFIX@: testutil-getgrgid.c
56-
$(ECHO_CC)
57-
$(LDCC) $< -o $@
58-
5955
libtestutil-time@SHLIB_SUFFIX@: testutil-time.c
6056
$(ECHO_CC)
6157
$(LDCC) $< -o $@
@@ -72,7 +68,6 @@ clean:
7268
rm -f libtestutil-getgroups@SHLIB_SUFFIX@
7369
rm -f libtestutil-0getgroups@SHLIB_SUFFIX@
7470
rm -f libtestutil-dupgetgroups@SHLIB_SUFFIX@
75-
rm -f libtestutil-getgrgid@SHLIB_SUFFIX@
7671
rm -f libtestutil-time@SHLIB_SUFFIX@
7772
rm -f libtestutil-mktime@SHLIB_SUFFIX@
7873
rm -f envmodules.c.gcov envmodules.gcda envmodules.gcno
@@ -99,5 +94,5 @@ endif
9994
$(V).SILENT: envmodules.o libtclenvmodules@TCL_SHLIB_SUFFIX@ \
10095
libtestutil-closedir@SHLIB_SUFFIX@ libtestutil-getpwuid@SHLIB_SUFFIX@ \
10196
libtestutil-getgroups@SHLIB_SUFFIX@ libtestutil-0getgroups@SHLIB_SUFFIX@ \
102-
libtestutil-dupgetgroups@SHLIB_SUFFIX@ libtestutil-getgrgid@SHLIB_SUFFIX@ \
103-
libtestutil-time@SHLIB_SUFFIX@ libtestutil-mktime@SHLIB_SUFFIX@
97+
libtestutil-dupgetgroups@SHLIB_SUFFIX@ libtestutil-time@SHLIB_SUFFIX@ \
98+
libtestutil-mktime@SHLIB_SUFFIX@

lib/testutil-getgrgid.c

Lines changed: 0 additions & 29 deletions
This file was deleted.

testsuite/example/siteconfig.tcl-1

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,6 @@ if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBDUPGETGROUPS)]} {
168168
report [initStateUsergroups]
169169
}
170170

171-
# test tcl ext lib procedures against a failed getgrgid call
172-
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDGETGRGID)]} {
173-
if {[catch {[initStateUsergroups]} errMsg]} {
174-
reportError $errMsg
175-
}
176-
}
177-
178171
# test tcl ext lib procedures against a failed time call
179172
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDTIME)]} {
180173
if {[catch {[initStateClockSeconds]} errMsg]} {

testsuite/modules.00-init/005-init_ts.exp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ if {$install_libtclenvmodules eq {y}} {
166166
set getgroupslib_file lib/libtestutil-getgroups$install_shlib_suffix
167167
set 0getgroupslib_file lib/libtestutil-0getgroups$install_shlib_suffix
168168
set dupgetgroupslib_file lib/libtestutil-dupgetgroups$install_shlib_suffix
169-
set getgrgidlib_file lib/libtestutil-getgrgid$install_shlib_suffix
170169
set timelib_file lib/libtestutil-time$install_shlib_suffix
171170
set mktimelib_file lib/libtestutil-mktime$install_shlib_suffix
172171
}

testsuite/modules.00-init/120-siteconfig.exp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -473,21 +473,6 @@ if {[info exists dupgetgroupslib_file] && [file exists $dupgetgroupslib_file]} {
473473
send_user "\tSkip tcl ext lib erroneous procedure calls as dupgetgroups test lib is not available\n"
474474
}
475475

476-
# test tcl ext lib procedures against a failed getgrgid call
477-
if {[info exists getgrgidlib_file] && [file exists $getgrgidlib_file]} {
478-
setenv_var TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDGETGRGID 1
479-
setenv_var LD_PRELOAD $getgrgidlib_file
480-
set ans [list]
481-
lappend ans "$error_msgs: couldn't find name for group id \".*\": .*"
482-
lappend ans $vers_reportre
483-
testouterr_cmd_re sh -V OK [join $ans \n]
484-
485-
unsetenv_var TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDGETGRGID
486-
unsetenv_var LD_PRELOAD
487-
} elseif {$verbose} {
488-
send_user "\tSkip tcl ext lib erroneous procedure calls as getgrgid test lib is not available\n"
489-
}
490-
491476
# test tcl ext lib procedures against a failed time call
492477
if {[info exists timelib_file] && [file exists $timelib_file]} {
493478
setenv_var TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDTIME 1

0 commit comments

Comments
 (0)