From: Bruno Haible Date: Thu, 21 Mar 2024 12:06:39 +0000 (+0100) Subject: gnulib-tool-tests: Fix a failure of test-oath-toolkit-[345].sh. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b978ab61d1bec7477720a62d9805b0ebfea98497;p=gnulib%2Fmaint-tools.git gnulib-tool-tests: Fix a failure of test-oath-toolkit-[345].sh. --- diff --git a/gnulib-tool-tests/init.sh b/gnulib-tool-tests/init.sh index 7d563762..bb4b8e4a 100644 --- a/gnulib-tool-tests/init.sh +++ b/gnulib-tool-tests/init.sh @@ -128,6 +128,11 @@ do_import_test () (cd "$1" && tar cf - .) | (cd $tmp-result && tar xf -) (cd $tmp-result/"$2" && $GNULIB_SRCDIR/gnulib-tool --gnulib-dir="$gnulib_dir" $3) >$tmp-out 2>$tmp-err rc=$? + # Remove empty build-aux dirs, since we cannot check them in as part of the expected result. + build_aux_dir=`find $tmp-result -name build-aux -type d -empty -print` + if test -n "$build_aux_dir"; then + rmdir $build_aux_dir + fi # Remove autom4te.cache directory, since it may depend on the Autoconf version or M4 version. rm -rf $tmp-result/"$2"/autom4te.cache if test $rc != 0; then