[automake-commit] branch master updated: tests: add coverage for nobase_ and dist_ prefixes

[Mike Frysinger]

This is an automated email from the git hooks/post-receive script.

vapier pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=58d06e075f11935a64f155d71b95ce0f9b0c8c8c

The following commit(s) were added to refs/heads/master by this push:
     new 58d06e075 tests: add coverage for nobase_ and dist_ prefixes
58d06e075 is described below

commit 58d06e075f11935a64f155d71b95ce0f9b0c8c8c
Author: Mike Frysinger <vapier@gentoo.org>
AuthorDate: Wed Jan 19 03:31:07 2022 -0500

    tests: add coverage for nobase_ and dist_ prefixes
    
    From automake bug https://bugs.gnu.org/14245.
    
    We have tests that check nobase_ and nodist_ interaction, but not
    nobase_ and dist_.  We had a report against automake 1.12 that this
    combo did not work.  It seems to work now, but lets include a test
    to make sure we don't regress.
    
    Based on Daiki Ueno's example, but fixed up to pass against master.
    
    * t/list-of-tests.mk: Add t/nobase-dist.sh.
    * t/nobase-dist.sh: New test.
---
 t/list-of-tests.mk |  1 +
 t/nobase-dist.sh   | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 04a64aa47..1601154e0 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -724,6 +724,7 @@ t/no-extra-c-stuff.sh \
 t/no-extra-makefile-code.sh \
 t/no-spurious-install-recursive.sh \
 t/nobase.sh \
+t/nobase-dist.sh \
 t/nobase-libtool.sh \
 t/nobase-python.sh \
 t/nobase-nodist.sh \
diff --git a/t/nobase-dist.sh b/t/nobase-dist.sh
new file mode 100644
index 000000000..b2ead50ee
--- /dev/null
+++ b/t/nobase-dist.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2011-2022 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Interaction of 'nobase_' and 'dist_' prefixes.
+
+. test-init.sh
+
+cat >> configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+foodir = $(prefix)/foo
+
+bardir = $(prefix)/bar
+
+sub/nodist.dat:
+       $(MKDIR_P) sub
+       : > $@
+
+nobase_foo_DATA = sub/nodist.dat
+nobase_dist_foo_DATA = sub/dist.dat
+
+dist_bar_DATA = sub/base.dat
+nobase_dist_bar_DATA = sub/nobase.dat
+
+CLEANFILES = sub/nodist.dat
+EOF
+
+mkdir sub
+
+: > sub/dist.dat
+: > sub/nobase.dat
+: > sub/base.dat
+
+rm -f install-sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure --prefix "$(pwd)/inst"
+
+$MAKE
+$MAKE install
+
+test -f inst/foo/sub/nodist.dat
+test -f inst/foo/sub/dist.dat
+
+test -f inst/bar/sub/nobase.dat
+test -f inst/bar/base.dat
+
+$MAKE distcheck
+
+: