diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-04-28 14:40:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-04-28 14:41:40 -0700 |
| commit | c90af8b74e814db63b2fd20b03f80619e24cec5d (patch) | |
| tree | 8fa403a66fa4cfdaa10eba675cdfae30d9e3496d | |
| parent | 1be44048ddb4c0b55c26818fb6e68f5d882fbf92 (diff) | |
| download | gnulib-c90af8b74e814db63b2fd20b03f80619e24cec5d.tar.gz | |
glob: improve config and test cleanup
Config problem reported by Benno Schulenberg in:
https://lists.gnu.org/r/bug-gnulib/2022-04/msg00071.html
* m4/glob.m4 (gl_GLOB): Clean up temporary file.
Also, name it conf$$-file not conf-file, so it’s cleaned
up on interrupt.
* modules/glob-tests (MOSTLYCLEANFILES):
Append test-glob.tglobfile, test-glob.tgloblink[123].
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | m4/glob.m4 | 6 | ||||
| -rw-r--r-- | modules/glob-tests | 5 |
3 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2022-04-28 Paul Eggert <eggert@cs.ucla.edu> + + glob: improve config and test cleanup + Config problem reported by Benno Schulenberg in: + https://lists.gnu.org/r/bug-gnulib/2022-04/msg00071.html + * m4/glob.m4 (gl_GLOB): Clean up temporary file. + Also, name it conf$$-file not conf-file, so it’s cleaned + up on interrupt. + * modules/glob-tests (MOSTLYCLEANFILES): + Append test-glob.tglobfile, test-glob.tgloblink[123]. + 2022-04-26 Paul Eggert <eggert@cs.ucla.edu> glob: port to NetBSD 9.2 diff --git a/m4/glob.m4 b/m4/glob.m4 index cf5f93930c..f59b84ff05 100644 --- a/m4/glob.m4 +++ b/m4/glob.m4 @@ -1,4 +1,4 @@ -# glob.m4 serial 25 +# glob.m4 serial 26 dnl Copyright (C) 2005-2007, 2009-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -70,7 +70,7 @@ char a[_GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 ? 1 AC_CACHE_CHECK([whether glob NOTDIR*/ omits symlink to nondir], [gl_cv_glob_omit_nondir_symlinks], [if test $cross_compiling != yes; then - if ln -s conf-file conf$$-globtest 2>/dev/null && touch conf-file + if ln -s conf$$-file conf$$-globtest 2>/dev/null && touch conf$$-file then gl_cv_glob_omit_nondir_symlinks=maybe else @@ -94,7 +94,7 @@ char a[_GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 ? 1 : ]) fi - rm -f conf$$-globtest + rm -f conf$$-file conf$$-globtest else gl_cv_glob_omit_nondir_symlinks="$gl_cross_guess_normal" fi diff --git a/modules/glob-tests b/modules/glob-tests index f551f6c950..ec519cf38d 100644 --- a/modules/glob-tests +++ b/modules/glob-tests @@ -12,3 +12,8 @@ Makefile.am: TESTS += test-glob check_PROGRAMS += test-glob test_glob_LDADD = $(LDADD) $(LIB_MBRTOWC) +MOSTLYCLEANFILES += \ + test-glob.tglobfile \ + test-glob.tgloblink1 \ + test-glob.tgloblink2 \ + test-glob.tgloblink3 |