From: Bruno Haible Date: Sun, 7 Apr 2024 00:47:03 +0000 (+0200) Subject: gnulib-tool-tests: Fix trouble caused by empty directories. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=52d75fdb2dd65c95116d543a8e10174352bf9440;p=gnulib%2Fmaint-tools.git gnulib-tool-tests: Fix trouble caused by empty directories. --- diff --git a/gnulib-tool-tests/import-tests/README b/gnulib-tool-tests/import-tests/README index fa1b8f46..93a01f09 100644 --- a/gnulib-tool-tests/import-tests/README +++ b/gnulib-tool-tests/import-tests/README @@ -18,6 +18,8 @@ To add a new package: - *.m4 - build-aux/* - all .h and .c files that were added by previous gnulib-tool invocations. +- Then eliminate all empty directories (since empty directories cannot be + committed into git). - Look at all .gitignore files, and eliminate file names and patterns that may match files generated by gnulib-tool. In particular, eliminate '*~'. - Create a test--.sh file. @@ -36,4 +38,4 @@ To add a new package: 2. Commit the new files, including all files in the test--.result directory. 3. Restore the .gitignore files in the test--.result directory. - Commit them in a separate commit. + Commit them, either in a separate commit, or with 'git commit --amend'. diff --git a/gnulib-tool-tests/import-tests/test-gettext-1.out b/gnulib-tool-tests/import-tests/test-gettext-1.out index 4ed6f41b..836fbf4d 100644 --- a/gnulib-tool-tests/import-tests/test-gettext-1.out +++ b/gnulib-tool-tests/import-tests/test-gettext-1.out @@ -622,6 +622,7 @@ File list: m4/zzgnulib.m4 Creating directory gettext-runtime/gnulib-lib Creating directory gettext-runtime/gnulib-m4 +Creating directory gettext-runtime/doc Creating directory gettext-runtime/../build-aux Creating directory gettext-runtime/gnulib-lib/glthread Creating directory gettext-runtime/gnulib-lib/malloc diff --git a/gnulib-tool-tests/import-tests/test-gettext-4.out b/gnulib-tool-tests/import-tests/test-gettext-4.out index 7646c8ba..6e5700da 100644 --- a/gnulib-tool-tests/import-tests/test-gettext-4.out +++ b/gnulib-tool-tests/import-tests/test-gettext-4.out @@ -2512,7 +2512,10 @@ File list: lib/wctomb.c -> tests/wctomb.c lib/windows-thread.c -> tests/windows-thread.c lib/windows-thread.h -> tests/windows-thread.h +Creating directory gettext-tools/gnulib-lib Creating directory gettext-tools/gnulib-m4 +Creating directory gettext-tools/doc +Creating directory gettext-tools/gnulib-tests Creating directory gettext-tools/../build-aux Creating directory gettext-tools/gnulib-lib/glthread Creating directory gettext-tools/gnulib-lib/libxml diff --git a/gnulib-tool-tests/import-tests/test-gettext-5.out b/gnulib-tool-tests/import-tests/test-gettext-5.out index d7f6b1d3..9478d894 100644 --- a/gnulib-tool-tests/import-tests/test-gettext-5.out +++ b/gnulib-tool-tests/import-tests/test-gettext-5.out @@ -151,6 +151,7 @@ File list: m4/wctype_h.m4 m4/wint_t.m4 m4/zzgnulib.m4 +Creating directory gettext-tools/libgrep Creating directory gettext-tools/libgrep/gnulib-m4 Creating directory gettext-tools/../build-aux Creating directory gettext-tools/libgrep/glthread diff --git a/gnulib-tool-tests/import-tests/test-gettext-6.out b/gnulib-tool-tests/import-tests/test-gettext-6.out index 7fa5f1be..76860610 100644 --- a/gnulib-tool-tests/import-tests/test-gettext-6.out +++ b/gnulib-tool-tests/import-tests/test-gettext-6.out @@ -609,7 +609,9 @@ File list: m4/xsize.m4 m4/xvasprintf.m4 m4/zzgnulib.m4 +Creating directory gettext-tools/libgettextpo Creating directory gettext-tools/libgettextpo/gnulib-m4 +Creating directory gettext-tools/doc Creating directory gettext-tools/../build-aux Creating directory gettext-tools/libgettextpo/glthread Creating directory gettext-tools/libgettextpo/uniconv diff --git a/gnulib-tool-tests/import-tests/test-gettext-7.out b/gnulib-tool-tests/import-tests/test-gettext-7.out index 953b566e..939c5003 100644 --- a/gnulib-tool-tests/import-tests/test-gettext-7.out +++ b/gnulib-tool-tests/import-tests/test-gettext-7.out @@ -33,6 +33,7 @@ File list: m4/threadlib.m4 m4/warn-on-use.m4 m4/zzgnulib.m4 +Creating directory gettext-tools/tests/gnulib-lib Creating directory gettext-tools/tests/gnulib-m4 Creating directory gettext-tools/../build-aux Creating directory gettext-tools/tests/gnulib-lib/glthread diff --git a/gnulib-tool-tests/import-tests/test-gettext-8.out b/gnulib-tool-tests/import-tests/test-gettext-8.out index db96ca07..5438e98b 100644 --- a/gnulib-tool-tests/import-tests/test-gettext-8.out +++ b/gnulib-tool-tests/import-tests/test-gettext-8.out @@ -758,7 +758,9 @@ File list: lib/c++defs.h -> tests/c++defs.h lib/dummy.c -> tests/dummy.c lib/warn-on-use.h -> tests/warn-on-use.h +Creating directory ./lib Creating directory ./gnulib-m4 +Creating directory ./tests Creating directory ./build-aux Creating directory ./lib/glib Creating directory ./lib/glthread