From 4fff4f3c05c1889d5777b1a951e02ffe0ae88dae Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 23 Jan 2008 23:38:34 +0100 Subject: [PATCH] Split libtool part off of nobase.test. * tests/nobase.test: Split off libtool part of nobase.test for increased test exposure, to ... * tests/nobase-libtool.test: ... this new test. * tests/Makefile.am: Update. --- ChangeLog | 7 ++++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/nobase-libtool.test | 88 +++++++++++++++++++++++++++++++++++++++ tests/nobase.test | 18 ++------ 5 files changed, 101 insertions(+), 14 deletions(-) create mode 100755 tests/nobase-libtool.test diff --git a/ChangeLog b/ChangeLog index 649e9ac7b..e94efcb87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-23 Ralf Wildenhues + + * tests/nobase.test: Split off libtool part of nobase.test for + increased test exposure, to ... + * tests/nobase-libtool.test: ... this new test. + * tests/Makefile.am: Update. + 2008-01-23 Eric Blake Fix color.test when using BSD grep. diff --git a/tests/Makefile.am b/tests/Makefile.am index 796a34dd8..9a07eb1e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -389,6 +389,7 @@ mkinst3.test \ mmodely.test \ multlib.test \ nobase.test \ +nobase-libtool.test \ nodef.test \ nodef2.test \ nodep.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 219d4dd00..1cfe81119 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -538,6 +538,7 @@ mkinst3.test \ mmodely.test \ multlib.test \ nobase.test \ +nobase-libtool.test \ nodef.test \ nodef2.test \ nodep.test \ diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test new file mode 100755 index 000000000..c0b998ce8 --- /dev/null +++ b/tests/nobase-libtool.test @@ -0,0 +1,88 @@ +#! /bin/sh +# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008 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 3, 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 . + +# Make sure nobase_* works for libtool libraries as well. +# This is just the libtool equivalent of nobase.test, split +# up for greater exposure of nobase.test. + +required='libtoolize gcc' +. ./defs || exit 1 + +set -e + +cat >> configure.in <<'EOF' +AC_PROG_CC +AC_PROG_LIBTOOL +AC_OUTPUT +EOF + +cat > Makefile.am << 'EOF' +fooexecdir = $(prefix)/foo +fooexec_LTLIBRARIES = sub/libbase.la +nobase_fooexec_LTLIBRARIES = sub/libnobase.la +sub_libbase_la_SOURCES = source2.c +sub_libnobase_la_SOURCES = source2.c + +test-install-data: install-data + test ! -f inst/foo/sub/libnobase.la + test ! -f inst/foo/libbase.la + +test-install-exec: install-exec + test -f inst/foo/sub/libnobase.la + test ! -f inst/foo/libnobase.la + test -f inst/foo/libbase.la +EOF + +mkdir sub + +cat >source2.c <<'EOF' +int +main (int argc, char *argv[]) +{ + return 0; +} +EOF + +rm -f install-sh + +libtoolize +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a --copy +./configure --prefix "`pwd`/inst" --program-prefix=p + +$MAKE +$MAKE test-install-data +$MAKE test-install-exec +$MAKE uninstall + +test `find inst/foo -type f -print | wc -l` = 0 + +$MAKE install-strip + +# Likewise, in a VPATH build. + +$MAKE uninstall +$MAKE distclean +mkdir build +cd build +../configure --prefix "`pwd`/inst" --program-prefix=p +$MAKE +$MAKE test-install-data +$MAKE test-install-exec +$MAKE uninstall +test `find inst/foo -type f -print | wc -l` = 0 diff --git a/tests/nobase.test b/tests/nobase.test index 24d39dae0..9f14fabfc 100755 --- a/tests/nobase.test +++ b/tests/nobase.test @@ -1,5 +1,6 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008 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 @@ -16,14 +17,14 @@ # Make sure nobase_* works. -required='libtoolize gcc' +required='gcc' . ./defs || exit 1 set -e cat >> configure.in <<'EOF' AC_PROG_CC -AC_PROG_LIBTOOL +AC_PROG_RANLIB AC_OUTPUT EOF @@ -50,11 +51,6 @@ nobase_fooexec_LIBRARIES = sub/libnobase.a sub_libbase_a_SOURCES = source.c sub_libnobase_a_SOURCES = source.c -fooexec_LTLIBRARIES = sub/libbase.la -nobase_fooexec_LTLIBRARIES = sub/libnobase.la -sub_libbase_la_SOURCES = source2.c -sub_libnobase_la_SOURCES = source2.c - test-install-data: install-data test -f inst/foo/sub/nobase.h test ! -f inst/foo/nobase.h @@ -68,8 +64,6 @@ test-install-data: install-data test ! -f inst/foo/pbase$(EXEEXT) test ! -f inst/foo/sub/libnobase.a test ! -f inst/foo/libbase.a - test ! -f inst/foo/sub/libnobase.la - test ! -f inst/foo/libbase.la test-install-exec: install-exec test -f inst/foo/sub/pnobase.sh @@ -81,9 +75,6 @@ test-install-exec: install-exec test -f inst/foo/sub/libnobase.a test ! -f inst/foo/libnobase.a test -f inst/foo/libbase.a - test -f inst/foo/sub/libnobase.la - test ! -f inst/foo/libnobase.la - test -f inst/foo/libbase.la EOF mkdir sub @@ -106,7 +97,6 @@ cp source.c source2.c rm -f install-sh -libtoolize $ACLOCAL $AUTOCONF $AUTOMAKE -a --copy -- 2.47.2