Paul Eggert wrote:
> > If you have objections to that, I would instead
> > - move the tst-* files to a subdirectory, say from-glibc/,
> > - change the module descriptions so that
> > tests/from-glibc/tst-stdc_trailing_zeros.c
> > is compiled to an executable named
> > ${tests_prefix}/test-stdc_trailing_zeros${EXEEXT}.
> > So that the autocompletion again works.
>
> That should work
Done.
>From 59b39732ddacf818d2c9cb6086a0f31dd252944d Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Mon, 13 May 2024 23:46:59 +0200
Subject: [PATCH] stdbit tests: Adhere better to Gnulib naming conventions.
* tests/from-glibc/tst-stdc_bit_ceil.c: Renamed from
tests/tst-stdc_bit_ceil.c.
* tests/from-glibc/tst-stdc_bit_floor.c: Renamed from
tests/tst-stdc_bit_floor.c.
* tests/from-glibc/tst-stdc_bit_width.c: Renamed from
tests/tst-stdc_bit_width.c.
* tests/from-glibc/tst-stdc_count_ones.c: Renamed from
tests/tst-stdc_count_ones.c.
* tests/from-glibc/tst-stdc_count_zeros.c: Renamed from
tests/tst-stdc_count_zeros.c.
* tests/from-glibc/tst-stdc_first_leading_one.c: Renamed from
tests/tst-stdc_first_leading_one.c.
* tests/from-glibc/tst-stdc_first_leading_zero.c: Renamed from
tests/tst-stdc_first_leading_zero.c.
* tests/from-glibc/tst-stdc_first_trailing_one.c: Renamed from
tests/tst-stdc_first_trailing_one.c.
* tests/from-glibc/tst-stdc_first_trailing_zero.c: Renamed from
tests/tst-stdc_first_trailing_zero.c.
* tests/from-glibc/tst-stdc_has_single_bit.c: Renamed from
tests/tst-stdc_has_single_bit.c.
* tests/from-glibc/tst-stdc_leading_ones.c: Renamed from
tests/tst-stdc_leading_ones.c.
* tests/from-glibc/tst-stdc_leading_zeros.c: Renamed from
tests/tst-stdc_leading_zeros.c.
* tests/from-glibc/tst-stdc_trailing_ones.c: Renamed from
tests/tst-stdc_trailing_ones.c.
* tests/from-glibc/tst-stdc_trailing_zeros.c: Renamed from
tests/tst-stdc_trailing_zeros.c.
* tests/from-glibc/tst-stdbit.h: Renamed from tests/tst-stdbit.h.
* tests/from-glibc/support/test-driver.c: Renamed from
tests/support/test-driver.c.
* modules/stdbit-tests (Files, Makefile.am): Update.
* config/srclist.txt: Update.
---
ChangeLog | 37 ++++++
config/srclist.txt | 30 ++---
modules/stdbit-tests | 116 +++++++++++-------
tests/{ => from-glibc}/support/test-driver.c | 0
tests/{ => from-glibc}/tst-stdbit.h | 0
tests/{ => from-glibc}/tst-stdc_bit_ceil.c | 0
tests/{ => from-glibc}/tst-stdc_bit_floor.c | 0
tests/{ => from-glibc}/tst-stdc_bit_width.c | 0
tests/{ => from-glibc}/tst-stdc_count_ones.c | 0
tests/{ => from-glibc}/tst-stdc_count_zeros.c | 0
.../tst-stdc_first_leading_one.c | 0
.../tst-stdc_first_leading_zero.c | 0
.../tst-stdc_first_trailing_one.c | 0
.../tst-stdc_first_trailing_zero.c | 0
.../tst-stdc_has_single_bit.c | 0
.../{ => from-glibc}/tst-stdc_leading_ones.c | 0
.../{ => from-glibc}/tst-stdc_leading_zeros.c | 0
.../{ => from-glibc}/tst-stdc_trailing_ones.c | 0
.../tst-stdc_trailing_zeros.c | 0
19 files changed, 124 insertions(+), 59 deletions(-)
rename tests/{ => from-glibc}/support/test-driver.c (100%)
rename tests/{ => from-glibc}/tst-stdbit.h (100%)
rename tests/{ => from-glibc}/tst-stdc_bit_ceil.c (100%)
rename tests/{ => from-glibc}/tst-stdc_bit_floor.c (100%)
rename tests/{ => from-glibc}/tst-stdc_bit_width.c (100%)
rename tests/{ => from-glibc}/tst-stdc_count_ones.c (100%)
rename tests/{ => from-glibc}/tst-stdc_count_zeros.c (100%)
rename tests/{ => from-glibc}/tst-stdc_first_leading_one.c (100%)
rename tests/{ => from-glibc}/tst-stdc_first_leading_zero.c (100%)
rename tests/{ => from-glibc}/tst-stdc_first_trailing_one.c (100%)
rename tests/{ => from-glibc}/tst-stdc_first_trailing_zero.c (100%)
rename tests/{ => from-glibc}/tst-stdc_has_single_bit.c (100%)
rename tests/{ => from-glibc}/tst-stdc_leading_ones.c (100%)
rename tests/{ => from-glibc}/tst-stdc_leading_zeros.c (100%)
rename tests/{ => from-glibc}/tst-stdc_trailing_ones.c (100%)
rename tests/{ => from-glibc}/tst-stdc_trailing_zeros.c (100%)
diff --git a/ChangeLog b/ChangeLog
index 7d60be26fa..18aab772fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2024-05-13 Bruno Haible <br...@clisp.org>
+
+ stdbit tests: Adhere better to Gnulib naming conventions.
+ * tests/from-glibc/tst-stdc_bit_ceil.c: Renamed from
+ tests/tst-stdc_bit_ceil.c.
+ * tests/from-glibc/tst-stdc_bit_floor.c: Renamed from
+ tests/tst-stdc_bit_floor.c.
+ * tests/from-glibc/tst-stdc_bit_width.c: Renamed from
+ tests/tst-stdc_bit_width.c.
+ * tests/from-glibc/tst-stdc_count_ones.c: Renamed from
+ tests/tst-stdc_count_ones.c.
+ * tests/from-glibc/tst-stdc_count_zeros.c: Renamed from
+ tests/tst-stdc_count_zeros.c.
+ * tests/from-glibc/tst-stdc_first_leading_one.c: Renamed from
+ tests/tst-stdc_first_leading_one.c.
+ * tests/from-glibc/tst-stdc_first_leading_zero.c: Renamed from
+ tests/tst-stdc_first_leading_zero.c.
+ * tests/from-glibc/tst-stdc_first_trailing_one.c: Renamed from
+ tests/tst-stdc_first_trailing_one.c.
+ * tests/from-glibc/tst-stdc_first_trailing_zero.c: Renamed from
+ tests/tst-stdc_first_trailing_zero.c.
+ * tests/from-glibc/tst-stdc_has_single_bit.c: Renamed from
+ tests/tst-stdc_has_single_bit.c.
+ * tests/from-glibc/tst-stdc_leading_ones.c: Renamed from
+ tests/tst-stdc_leading_ones.c.
+ * tests/from-glibc/tst-stdc_leading_zeros.c: Renamed from
+ tests/tst-stdc_leading_zeros.c.
+ * tests/from-glibc/tst-stdc_trailing_ones.c: Renamed from
+ tests/tst-stdc_trailing_ones.c.
+ * tests/from-glibc/tst-stdc_trailing_zeros.c: Renamed from
+ tests/tst-stdc_trailing_zeros.c.
+ * tests/from-glibc/tst-stdbit.h: Renamed from tests/tst-stdbit.h.
+ * tests/from-glibc/support/test-driver.c: Renamed from
+ tests/support/test-driver.c.
+ * modules/stdbit-tests (Files, Makefile.am): Update.
+ * config/srclist.txt: Update.
+
2024-05-13 Bruno Haible <br...@clisp.org>
config: Clarify which destination files have a different basename.
diff --git a/config/srclist.txt b/config/srclist.txt
index 1a254e709d..8930847018 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -71,21 +71,21 @@ $LIBCSRC posix/regex.h lib
#$LIBCSRC posix/regex_internal.h lib
#$LIBCSRC posix/regexec.c lib
#$LIBCSRC stdlib/canonicalize.c lib/canonicalize-lgpl.c
-#$LIBCSRC stdlib/tst-stdbit.h tests
-$LIBCSRC stdlib/tst-stdc_bit_ceil.c tests
-$LIBCSRC stdlib/tst-stdc_bit_floor.c tests
-$LIBCSRC stdlib/tst-stdc_bit_width.c tests
-$LIBCSRC stdlib/tst-stdc_count_ones.c tests
-$LIBCSRC stdlib/tst-stdc_count_zeros.c tests
-$LIBCSRC stdlib/tst-stdc_first_leading_one.c tests
-$LIBCSRC stdlib/tst-stdc_first_leading_zero.c tests
-$LIBCSRC stdlib/tst-stdc_first_trailing_one.c tests
-$LIBCSRC stdlib/tst-stdc_first_trailing_zero.c tests
-$LIBCSRC stdlib/tst-stdc_has_single_bit.c tests
-$LIBCSRC stdlib/tst-stdc_leading_ones.c tests
-$LIBCSRC stdlib/tst-stdc_leading_zeros.c tests
-$LIBCSRC stdlib/tst-stdc_trailing_ones.c tests
-$LIBCSRC stdlib/tst-stdc_trailing_zeros.c tests
+#$LIBCSRC stdlib/tst-stdbit.h tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_bit_ceil.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_bit_floor.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_bit_width.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_count_ones.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_count_zeros.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_first_leading_one.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_first_leading_zero.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_first_trailing_one.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_first_trailing_zero.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_has_single_bit.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_leading_ones.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_leading_zeros.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_trailing_ones.c tests/from-glibc
+$LIBCSRC stdlib/tst-stdc_trailing_zeros.c tests/from-glibc
#$LIBCSRC sysdeps/generic/eloop-threshold.h lib
$LIBCSRC time/timegm.c lib
#$LIBCSRC time/mktime.c lib
diff --git a/modules/stdbit-tests b/modules/stdbit-tests
index 3361ff62e0..15386befba 100644
--- a/modules/stdbit-tests
+++ b/modules/stdbit-tests
@@ -1,21 +1,21 @@
Files:
tests/macros.h
-tests/support/test-driver.c
-tests/tst-stdbit.h
-tests/tst-stdc_bit_ceil.c
-tests/tst-stdc_bit_floor.c
-tests/tst-stdc_bit_width.c
-tests/tst-stdc_count_ones.c
-tests/tst-stdc_count_zeros.c
-tests/tst-stdc_first_leading_one.c
-tests/tst-stdc_first_leading_zero.c
-tests/tst-stdc_first_trailing_one.c
-tests/tst-stdc_first_trailing_zero.c
-tests/tst-stdc_has_single_bit.c
-tests/tst-stdc_leading_ones.c
-tests/tst-stdc_leading_zeros.c
-tests/tst-stdc_trailing_ones.c
-tests/tst-stdc_trailing_zeros.c
+tests/from-glibc/support/test-driver.c
+tests/from-glibc/tst-stdbit.h
+tests/from-glibc/tst-stdc_bit_ceil.c
+tests/from-glibc/tst-stdc_bit_floor.c
+tests/from-glibc/tst-stdc_bit_width.c
+tests/from-glibc/tst-stdc_count_ones.c
+tests/from-glibc/tst-stdc_count_zeros.c
+tests/from-glibc/tst-stdc_first_leading_one.c
+tests/from-glibc/tst-stdc_first_leading_zero.c
+tests/from-glibc/tst-stdc_first_trailing_one.c
+tests/from-glibc/tst-stdc_first_trailing_zero.c
+tests/from-glibc/tst-stdc_has_single_bit.c
+tests/from-glibc/tst-stdc_leading_ones.c
+tests/from-glibc/tst-stdc_leading_zeros.c
+tests/from-glibc/tst-stdc_trailing_ones.c
+tests/from-glibc/tst-stdc_trailing_zeros.c
Depends-on:
assert-h
@@ -26,33 +26,61 @@ configure.ac:
Makefile.am:
TESTS += \
- tst-stdc_bit_ceil tst-stdc_bit_floor tst-stdc_bit_width \
- tst-stdc_count_ones tst-stdc_count_zeros tst-stdc_first_leading_one \
- tst-stdc_first_leading_zero tst-stdc_first_trailing_one \
- tst-stdc_first_trailing_zero tst-stdc_has_single_bit \
- tst-stdc_leading_ones tst-stdc_leading_zeros tst-stdc_trailing_ones \
- tst-stdc_trailing_zeros
+ test-stdc_bit_ceil test-stdc_bit_floor test-stdc_bit_width \
+ test-stdc_count_ones test-stdc_count_zeros test-stdc_first_leading_one \
+ test-stdc_first_leading_zero test-stdc_first_trailing_one \
+ test-stdc_first_trailing_zero test-stdc_has_single_bit \
+ test-stdc_leading_ones test-stdc_leading_zeros test-stdc_trailing_ones \
+ test-stdc_trailing_zeros
check_PROGRAMS += \
- tst-stdc_bit_ceil tst-stdc_bit_floor tst-stdc_bit_width \
- tst-stdc_count_ones tst-stdc_count_zeros tst-stdc_first_leading_one \
- tst-stdc_first_leading_zero tst-stdc_first_trailing_one \
- tst-stdc_first_trailing_zero tst-stdc_has_single_bit \
- tst-stdc_leading_ones tst-stdc_leading_zeros tst-stdc_trailing_ones \
- tst-stdc_trailing_zeros
-
-TEST_STDBIT_CPPFLAGS = $(AM_CPPFLAGS) -DGNULIB_TEST_STDBIT
-tst_stdc_bit_ceil_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_bit_floor_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_bit_width_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_count_ones_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_count_zeros_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_first_leading_one_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_first_leading_zero_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_first_trailing_one_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_first_trailing_zero_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_has_single_bit_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_leading_ones_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_leading_zeros_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_trailing_ones_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
-tst_stdc_trailing_zeros_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+ test-stdc_bit_ceil test-stdc_bit_floor test-stdc_bit_width \
+ test-stdc_count_ones test-stdc_count_zeros test-stdc_first_leading_one \
+ test-stdc_first_leading_zero test-stdc_first_trailing_one \
+ test-stdc_first_trailing_zero test-stdc_has_single_bit \
+ test-stdc_leading_ones test-stdc_leading_zeros test-stdc_trailing_ones \
+ test-stdc_trailing_zeros
+
+TEST_STDBIT_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/from-glibc -DGNULIB_TEST_STDBIT
+
+test_stdc_bit_ceil_SOURCES = from-glibc/tst-stdc_bit_ceil.c
+test_stdc_bit_ceil_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_bit_floor_SOURCES = from-glibc/tst-stdc_bit_floor.c
+test_stdc_bit_floor_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_bit_width_SOURCES = from-glibc/tst-stdc_bit_width.c
+test_stdc_bit_width_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_count_ones_SOURCES = from-glibc/tst-stdc_count_ones.c
+test_stdc_count_ones_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_count_zeros_SOURCES = from-glibc/tst-stdc_count_zeros.c
+test_stdc_count_zeros_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_first_leading_one_SOURCES = from-glibc/tst-stdc_first_leading_one.c
+test_stdc_first_leading_one_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_first_leading_zero_SOURCES = from-glibc/tst-stdc_first_leading_zero.c
+test_stdc_first_leading_zero_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_first_trailing_one_SOURCES = from-glibc/tst-stdc_first_trailing_one.c
+test_stdc_first_trailing_one_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_first_trailing_zero_SOURCES = from-glibc/tst-stdc_first_trailing_zero.c
+test_stdc_first_trailing_zero_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_has_single_bit_SOURCES = from-glibc/tst-stdc_has_single_bit.c
+test_stdc_has_single_bit_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_leading_ones_SOURCES = from-glibc/tst-stdc_leading_ones.c
+test_stdc_leading_ones_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_leading_zeros_SOURCES = from-glibc/tst-stdc_leading_zeros.c
+test_stdc_leading_zeros_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_trailing_ones_SOURCES = from-glibc/tst-stdc_trailing_ones.c
+test_stdc_trailing_ones_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
+
+test_stdc_trailing_zeros_SOURCES = from-glibc/tst-stdc_trailing_zeros.c
+test_stdc_trailing_zeros_CPPFLAGS = $(TEST_STDBIT_CPPFLAGS)
diff --git a/tests/support/test-driver.c b/tests/from-glibc/support/test-driver.c
similarity index 100%
rename from tests/support/test-driver.c
rename to tests/from-glibc/support/test-driver.c
diff --git a/tests/tst-stdbit.h b/tests/from-glibc/tst-stdbit.h
similarity index 100%
rename from tests/tst-stdbit.h
rename to tests/from-glibc/tst-stdbit.h
diff --git a/tests/tst-stdc_bit_ceil.c b/tests/from-glibc/tst-stdc_bit_ceil.c
similarity index 100%
rename from tests/tst-stdc_bit_ceil.c
rename to tests/from-glibc/tst-stdc_bit_ceil.c
diff --git a/tests/tst-stdc_bit_floor.c b/tests/from-glibc/tst-stdc_bit_floor.c
similarity index 100%
rename from tests/tst-stdc_bit_floor.c
rename to tests/from-glibc/tst-stdc_bit_floor.c
diff --git a/tests/tst-stdc_bit_width.c b/tests/from-glibc/tst-stdc_bit_width.c
similarity index 100%
rename from tests/tst-stdc_bit_width.c
rename to tests/from-glibc/tst-stdc_bit_width.c
diff --git a/tests/tst-stdc_count_ones.c b/tests/from-glibc/tst-stdc_count_ones.c
similarity index 100%
rename from tests/tst-stdc_count_ones.c
rename to tests/from-glibc/tst-stdc_count_ones.c
diff --git a/tests/tst-stdc_count_zeros.c b/tests/from-glibc/tst-stdc_count_zeros.c
similarity index 100%
rename from tests/tst-stdc_count_zeros.c
rename to tests/from-glibc/tst-stdc_count_zeros.c
diff --git a/tests/tst-stdc_first_leading_one.c b/tests/from-glibc/tst-stdc_first_leading_one.c
similarity index 100%
rename from tests/tst-stdc_first_leading_one.c
rename to tests/from-glibc/tst-stdc_first_leading_one.c
diff --git a/tests/tst-stdc_first_leading_zero.c b/tests/from-glibc/tst-stdc_first_leading_zero.c
similarity index 100%
rename from tests/tst-stdc_first_leading_zero.c
rename to tests/from-glibc/tst-stdc_first_leading_zero.c
diff --git a/tests/tst-stdc_first_trailing_one.c b/tests/from-glibc/tst-stdc_first_trailing_one.c
similarity index 100%
rename from tests/tst-stdc_first_trailing_one.c
rename to tests/from-glibc/tst-stdc_first_trailing_one.c
diff --git a/tests/tst-stdc_first_trailing_zero.c b/tests/from-glibc/tst-stdc_first_trailing_zero.c
similarity index 100%
rename from tests/tst-stdc_first_trailing_zero.c
rename to tests/from-glibc/tst-stdc_first_trailing_zero.c
diff --git a/tests/tst-stdc_has_single_bit.c b/tests/from-glibc/tst-stdc_has_single_bit.c
similarity index 100%
rename from tests/tst-stdc_has_single_bit.c
rename to tests/from-glibc/tst-stdc_has_single_bit.c
diff --git a/tests/tst-stdc_leading_ones.c b/tests/from-glibc/tst-stdc_leading_ones.c
similarity index 100%
rename from tests/tst-stdc_leading_ones.c
rename to tests/from-glibc/tst-stdc_leading_ones.c
diff --git a/tests/tst-stdc_leading_zeros.c b/tests/from-glibc/tst-stdc_leading_zeros.c
similarity index 100%
rename from tests/tst-stdc_leading_zeros.c
rename to tests/from-glibc/tst-stdc_leading_zeros.c
diff --git a/tests/tst-stdc_trailing_ones.c b/tests/from-glibc/tst-stdc_trailing_ones.c
similarity index 100%
rename from tests/tst-stdc_trailing_ones.c
rename to tests/from-glibc/tst-stdc_trailing_ones.c
diff --git a/tests/tst-stdc_trailing_zeros.c b/tests/from-glibc/tst-stdc_trailing_zeros.c
similarity index 100%
rename from tests/tst-stdc_trailing_zeros.c
rename to tests/from-glibc/tst-stdc_trailing_zeros.c
--
2.34.1
