* tests/java-uninstall.test: New test. * tests/Makefile.am (TESTS): Update. --- ChangeLog | 6 +++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/java-uninstall.test | 101 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 0 deletions(-) create mode 100755 tests/java-uninstall.test
diff --git a/ChangeLog b/ChangeLog index 520d728..0518868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-04-23 Stefano Lattarini <[email protected]> + java coverage: add test on uninstall with JAVA primary + * tests/java-uninstall.test: New test. + * tests/Makefile.am (TESTS): Update. + +2011-04-23 Stefano Lattarini <[email protected]> + java tests: require java compiler more properly * tests/java-extra.test: Use "required=javac" instead of ad-hoc configure check. diff --git a/tests/Makefile.am b/tests/Makefile.am index 05d69cf..8eb06d6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -443,6 +443,7 @@ java-compile-install.test \ java-sources.test \ java-no-duplicate.test \ java-mix.test \ +java-uninstall.test \ ldadd.test \ ldflags.test \ lex.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 3d6d7ec..a3859fe 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -714,6 +714,7 @@ java-compile-install.test \ java-sources.test \ java-no-duplicate.test \ java-mix.test \ +java-uninstall.test \ ldadd.test \ ldflags.test \ lex.test \ diff --git a/tests/java-uninstall.test b/tests/java-uninstall.test new file mode 100755 index 0000000..35d1e4a --- /dev/null +++ b/tests/java-uninstall.test @@ -0,0 +1,101 @@ +#! /bin/sh +# Copyright (C) 1998, 2001, 2002, 2004, 2007 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/>. + +# Check uninstallation of Java class files. + +required=javac +. ./defs || Exit 1 + +set -e + +cat >> configure.in << 'END' +AC_OUTPUT +END + +cat > Makefile.am << 'END' +javadir = $(prefix)/java +java_JAVA = Foo.java +nobase_java_JAVA = Foo2.java +nobase_dist_java_JAVA = Bar.java +nodist_java_JAVA = Baz.java + +# Java files are not distributed by default, so we distribute +# one "by hand" ... +EXTRA_DIST = Foo.java +# ... and make the other one generated. +Foo2.java: + rm -f $@ $@-t + echo 'class bClass {}' > $@-t + chmod a-w $@-t && mv -f $@-t $@ + +# Explicitly declared as `nodist_', so generate it. +Baz.java: + rm -f $@ $@-t + echo 'class Baz {}' > $@-t + echo 'class Baz2 {}' >> $@-t + chmod a-w $@-t && mv -f $@-t $@ + +DISTCLEANFILES = Baz.java Foo2.java +END + +echo 'class aClass {}' > Foo.java +echo 'class Zardoz {}' > Bar.java + +$ACLOCAL +$AUTOCONF +$AUTOMAKE + +./configure --prefix="`pwd`"/_inst +javadir=_inst/java + +check_uninstallation() +{ + test ! -r $javadir/aClass.class + test ! -r $javadir/bClass.class + test ! -r $javadir/Zardoz.class + test ! -r $javadir/Baz.class + test ! -r $javadir/Baz2.class + test -f $javadir/Foo.class + test -f $javadir/Bar.class + test -f $javadir/xClass.class + test -f $javadir/aclass.class +} + +$MAKE +ls -l +$MAKE install +: > $javadir/Foo.class +: > $javadir/Bar.class +: > $javadir/xClass.class +: > $javadir/aclass.class +ls -l $javadir +$MAKE uninstall +ls -l $javadir +check_uninstallation + +# FIXME: "make uninstall" should continue to work also after "make clean", +# but currently this doesn't happen. See automake bug#8540. +$MAKE install +ls -l $javadir +$MAKE clean +ls -l +$MAKE uninstall +ls -l $javadir +#check_uninstallation + +$MAKE distcheck + +: -- 1.7.2.3
