| Message ID | 87k081sj8i.fsf@oldenburg.str.redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Linux: dirent/tst-readdir64-compat needs to use TEST_COMPAT (bug 27654) | expand |
On 25/07/22 05:13, Florian Weimer via Libc-alpha wrote: > The hppa port starts libc at GLIBC_2.2, but has earlier symbol > versions in other shared objects. This means that the compat > symbol for readdir64 is not actually present in libc even though > have-GLIBC_2.1.3 is defined as yes at the make level. > > Fixes commit 15e50e6c966fa0f26612602a95f0129543d9f9d5 ("Linux: > dirent/tst-readdir64-compat can be a regular test") by mostly > reverting it. > > Tested on i686-linux-gnu. Built on hppa-linux-gnu. LGTM, thanks. This is ok for 2.36. > > --- > sysdeps/unix/sysv/linux/Makefile | 10 ++++------ > sysdeps/unix/sysv/linux/tst-readdir64-compat.c | 4 ++++ > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index 2ccc92b6b8..a139a16532 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -361,12 +361,10 @@ inhibit-glue = yes > > ifeq ($(subdir),dirent) > sysdep_routines += getdirentries getdirentries64 > -tests += tst-getdents64 > - > -# The tested readdir64 symbol was replaced in glibc 2.2. > -ifeq ($(have-GLIBC_2.1.3)$(build-shared),yesyes) > -tests += tst-readdir64-compat > -endif > +tests += \ > + tst-getdents64 \ > + tst-readdir64-compat \ > + # tests > endif # $(subdir) == dirent > > ifeq ($(subdir),nis) > diff --git a/sysdeps/unix/sysv/linux/tst-readdir64-compat.c b/sysdeps/unix/sysv/linux/tst-readdir64-compat.c > index e1f6166146..1f1302e543 100644 > --- a/sysdeps/unix/sysv/linux/tst-readdir64-compat.c > +++ b/sysdeps/unix/sysv/linux/tst-readdir64-compat.c > @@ -37,12 +37,15 @@ struct __old_dirent64 > > typedef struct __old_dirent64 *(*compat_readdir64_type) (DIR *); > > +#if TEST_COMPAT (libc, GLIBC_2_1, GLIBC_2_2) > struct __old_dirent64 *compat_readdir64 (DIR *); > compat_symbol_reference (libc, compat_readdir64, readdir64, GLIBC_2_1); > +#endif > > static int > do_test (void) > { > +#if TEST_COMPAT (libc, GLIBC_2_1, GLIBC_2_2) > /* Directory stream using the non-compat readdir64 symbol. The test > checks against this. */ > DIR *dir_reference = opendir ("."); > @@ -104,6 +107,7 @@ do_test (void) > > TEST_COMPARE (closedir (dir_test), 0); > TEST_COMPARE (closedir (dir_reference), 0); > +#endif > return 0; > } > >
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 2ccc92b6b8..a139a16532 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -361,12 +361,10 @@ inhibit-glue = yes ifeq ($(subdir),dirent) sysdep_routines += getdirentries getdirentries64 -tests += tst-getdents64 - -# The tested readdir64 symbol was replaced in glibc 2.2. -ifeq ($(have-GLIBC_2.1.3)$(build-shared),yesyes) -tests += tst-readdir64-compat -endif +tests += \ + tst-getdents64 \ + tst-readdir64-compat \ + # tests endif # $(subdir) == dirent ifeq ($(subdir),nis) diff --git a/sysdeps/unix/sysv/linux/tst-readdir64-compat.c b/sysdeps/unix/sysv/linux/tst-readdir64-compat.c index e1f6166146..1f1302e543 100644 --- a/sysdeps/unix/sysv/linux/tst-readdir64-compat.c +++ b/sysdeps/unix/sysv/linux/tst-readdir64-compat.c @@ -37,12 +37,15 @@ struct __old_dirent64 typedef struct __old_dirent64 *(*compat_readdir64_type) (DIR *); +#if TEST_COMPAT (libc, GLIBC_2_1, GLIBC_2_2) struct __old_dirent64 *compat_readdir64 (DIR *); compat_symbol_reference (libc, compat_readdir64, readdir64, GLIBC_2_1); +#endif static int do_test (void) { +#if TEST_COMPAT (libc, GLIBC_2_1, GLIBC_2_2) /* Directory stream using the non-compat readdir64 symbol. The test checks against this. */ DIR *dir_reference = opendir ("."); @@ -104,6 +107,7 @@ do_test (void) TEST_COMPARE (closedir (dir_test), 0); TEST_COMPARE (closedir (dir_reference), 0); +#endif return 0; }
The hppa port starts libc at GLIBC_2.2, but has earlier symbol versions in other shared objects. This means that the compat symbol for readdir64 is not actually present in libc even though have-GLIBC_2.1.3 is defined as yes at the make level. Fixes commit 15e50e6c966fa0f26612602a95f0129543d9f9d5 ("Linux: dirent/tst-readdir64-compat can be a regular test") by mostly reverting it. Tested on i686-linux-gnu. Built on hppa-linux-gnu. --- sysdeps/unix/sysv/linux/Makefile | 10 ++++------ sysdeps/unix/sysv/linux/tst-readdir64-compat.c | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-)