From e41c95091ca6917b0bd76d043ce980e215517579 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 12 Apr 2024 16:43:15 +0200 Subject: [PATCH] gnulib-tool-tests: Make two test-cache-* tests more useful. --- gnulib-tool-tests/import-tests/test-cache-1-23.out | 4 ++-- .../lib/{Makefile.gnulib => GenMakefile.gnulib} | 2 +- .../test-cache-1-23.result/m4/gnulib-cache.m4 | 4 ++-- gnulib-tool-tests/import-tests/test-cache-1-23.sh | 2 +- gnulib-tool-tests/import-tests/test-cache-2-23.out | 8 ++++---- .../lib/{Makefile.gnulib => GenMakefile.gnulib} | 2 +- .../test-cache-2-23.result/m4/gnulib-cache.m4 | 4 ++-- .../tests/{Makefile.gnulib => GenMakefile.gnulib} | 0 gnulib-tool-tests/import-tests/test-cache-2-23.sh | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/{Makefile.gnulib => GenMakefile.gnulib} (98%) rename gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/{Makefile.gnulib => GenMakefile.gnulib} (99%) rename gnulib-tool-tests/import-tests/test-cache-2-23.result/tests/{Makefile.gnulib => GenMakefile.gnulib} (100%) diff --git a/gnulib-tool-tests/import-tests/test-cache-1-23.out b/gnulib-tool-tests/import-tests/test-cache-1-23.out index e77aa942..67d0a68a 100644 --- a/gnulib-tool-tests/import-tests/test-cache-1-23.out +++ b/gnulib-tool-tests/import-tests/test-cache-1-23.out @@ -12,13 +12,13 @@ Copying file m4/gnulib-tool.m4 Copying file m4/zzgnulib.m4 Updating m4/gnulib-cache.m4 (backup in m4/gnulib-cache.m4~) Creating m4/gnulib-comp.m4 -Creating lib/Makefile.gnulib +Creating lib/GenMakefile.gnulib Finished. You may need to add #include directives for the following .h files. Don't forget to - - "include Makefile.gnulib" from within "lib/Makefile.am", + - "include GenMakefile.gnulib" from within "lib/Makefile.am", - mention "-I m4" in ACLOCAL_AMFLAGS in Makefile.am or add an AC_CONFIG_MACRO_DIRS([m4]) invocation in ./configure.ac, - mention "m4/gnulib-cache.m4" in EXTRA_DIST in Makefile.am, diff --git a/gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/Makefile.gnulib b/gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/GenMakefile.gnulib similarity index 98% rename from gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/Makefile.gnulib rename to gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/GenMakefile.gnulib index c264eb8f..ce2c8663 100644 --- a/gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/Makefile.gnulib +++ b/gnulib-tool-tests/import-tests/test-cache-1-23.result/lib/GenMakefile.gnulib @@ -29,7 +29,7 @@ # --doc-base=doc \ # --tests-base=tests \ # --aux-dir=. \ -# --makefile-name=Makefile.gnulib \ +# --makefile-name=GenMakefile.gnulib \ # --no-conditional-dependencies \ # --no-libtool \ # --macro-prefix=gl diff --git a/gnulib-tool-tests/import-tests/test-cache-1-23.result/m4/gnulib-cache.m4 b/gnulib-tool-tests/import-tests/test-cache-1-23.result/m4/gnulib-cache.m4 index 85061d39..0dc8f523 100644 --- a/gnulib-tool-tests/import-tests/test-cache-1-23.result/m4/gnulib-cache.m4 +++ b/gnulib-tool-tests/import-tests/test-cache-1-23.result/m4/gnulib-cache.m4 @@ -34,7 +34,7 @@ # --doc-base=doc \ # --tests-base=tests \ # --aux-dir=. \ -# --makefile-name=Makefile.gnulib \ +# --makefile-name=GenMakefile.gnulib \ # --no-conditional-dependencies \ # --no-libtool \ # --macro-prefix=gl @@ -51,7 +51,7 @@ gl_PO_BASE([]) gl_DOC_BASE([doc]) gl_TESTS_BASE([tests]) gl_LIB([libgnu]) -gl_MAKEFILE_NAME([Makefile.gnulib]) +gl_MAKEFILE_NAME([GenMakefile.gnulib]) gl_MACRO_PREFIX([gl]) gl_PO_DOMAIN([]) gl_WITNESS_C_MACRO([]) diff --git a/gnulib-tool-tests/import-tests/test-cache-1-23.sh b/gnulib-tool-tests/import-tests/test-cache-1-23.sh index 0c3f5994..0f5fb06b 100755 --- a/gnulib-tool-tests/import-tests/test-cache-1-23.sh +++ b/gnulib-tool-tests/import-tests/test-cache-1-23.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_import_test cache-1 . "--makefile-name=Makefile.gnulib --add-import" +do_import_test cache-1 . "--makefile-name=GenMakefile.gnulib --add-import" diff --git a/gnulib-tool-tests/import-tests/test-cache-2-23.out b/gnulib-tool-tests/import-tests/test-cache-2-23.out index b6a0ceeb..81fe804a 100644 --- a/gnulib-tool-tests/import-tests/test-cache-2-23.out +++ b/gnulib-tool-tests/import-tests/test-cache-2-23.out @@ -244,17 +244,17 @@ Fetching gnulib PO files from https://translationproject.org/latest/ Creating po/LINGUAS Updating m4/gnulib-cache.m4 (backup in m4/gnulib-cache.m4~) Creating m4/gnulib-comp.m4 -Creating lib/Makefile.gnulib -Creating tests/Makefile.gnulib +Creating lib/GenMakefile.gnulib +Creating tests/GenMakefile.gnulib Finished. You may need to add #include directives for the following .h files. #include Don't forget to - - "include Makefile.gnulib" from within "lib/Makefile.am", + - "include GenMakefile.gnulib" from within "lib/Makefile.am", - add "po/Makefile.in" to AC_CONFIG_FILES in ./configure.ac, - - "include Makefile.gnulib" from within "tests/Makefile.am", + - "include GenMakefile.gnulib" from within "tests/Makefile.am", - mention "po" in SUBDIRS in Makefile.am, - mention "-I m4" in ACLOCAL_AMFLAGS in Makefile.am or add an AC_CONFIG_MACRO_DIRS([m4]) invocation in ./configure.ac, diff --git a/gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/Makefile.gnulib b/gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/GenMakefile.gnulib similarity index 99% rename from gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/Makefile.gnulib rename to gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/GenMakefile.gnulib index 25db0599..f7f6faed 100644 --- a/gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/Makefile.gnulib +++ b/gnulib-tool-tests/import-tests/test-cache-2-23.result/lib/GenMakefile.gnulib @@ -39,7 +39,7 @@ # --with-unportable-tests \ # --with-all-tests \ # --lgpl \ -# --makefile-name=Makefile.gnulib \ +# --makefile-name=GenMakefile.gnulib \ # --automake-subdir \ # --no-conditional-dependencies \ # --libtool \ diff --git a/gnulib-tool-tests/import-tests/test-cache-2-23.result/m4/gnulib-cache.m4 b/gnulib-tool-tests/import-tests/test-cache-2-23.result/m4/gnulib-cache.m4 index 72acb338..349929c1 100644 --- a/gnulib-tool-tests/import-tests/test-cache-2-23.result/m4/gnulib-cache.m4 +++ b/gnulib-tool-tests/import-tests/test-cache-2-23.result/m4/gnulib-cache.m4 @@ -44,7 +44,7 @@ # --with-unportable-tests \ # --with-all-tests \ # --lgpl \ -# --makefile-name=Makefile.gnulib \ +# --makefile-name=GenMakefile.gnulib \ # --automake-subdir \ # --no-conditional-dependencies \ # --libtool \ @@ -75,7 +75,7 @@ gl_TESTS_BASE([tests]) gl_WITH_TESTS gl_LIB([libgnu]) gl_LGPL -gl_MAKEFILE_NAME([Makefile.gnulib]) +gl_MAKEFILE_NAME([GenMakefile.gnulib]) gl_AUTOMAKE_SUBDIR gl_LIBTOOL gl_MACRO_PREFIX([gl]) diff --git a/gnulib-tool-tests/import-tests/test-cache-2-23.result/tests/Makefile.gnulib b/gnulib-tool-tests/import-tests/test-cache-2-23.result/tests/GenMakefile.gnulib similarity index 100% rename from gnulib-tool-tests/import-tests/test-cache-2-23.result/tests/Makefile.gnulib rename to gnulib-tool-tests/import-tests/test-cache-2-23.result/tests/GenMakefile.gnulib diff --git a/gnulib-tool-tests/import-tests/test-cache-2-23.sh b/gnulib-tool-tests/import-tests/test-cache-2-23.sh index 6bf702a3..9d042ed9 100755 --- a/gnulib-tool-tests/import-tests/test-cache-2-23.sh +++ b/gnulib-tool-tests/import-tests/test-cache-2-23.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_import_test cache-2 . "--makefile-name=Makefile.gnulib --add-import" +do_import_test cache-2 . "--makefile-name=GenMakefile.gnulib --add-import" -- 2.39.5