[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI 4/8] java tests: tweak and make stricter a couple of tests
From: |
Stefano Lattarini |
Subject: |
[FYI 4/8] java tests: tweak and make stricter a couple of tests |
Date: |
Tue, 26 Apr 2011 18:17:31 +0200 |
* tests/javasubst.test: Use proper m4 quoting. Add trailing `:'
command. Enable `errexit' shell flag, and related changes.
Prefer cat + here-doc over echo to append to configure.in.
Make grepping of Makefile.in stricter. Add debugging output.
Improve heading comments.
* tests/javaprim.test: Likewise.
---
ChangeLog | 10 ++++++++++
tests/javaprim.test | 13 ++++++++++---
tests/javasubst.test | 17 ++++++++++++-----
3 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0518868..50dfd16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2011-04-23 Stefano Lattarini <address@hidden>
+ java tests: tweak and make stricter a couple of tests
+ * tests/javasubst.test: Use proper m4 quoting. Add trailing `:'
+ command. Enable `errexit' shell flag, and related changes.
+ Prefer cat + here-doc over echo to append to configure.in.
+ Make grepping of Makefile.in stricter. Add debugging output.
+ Improve heading comments.
+ * tests/javaprim.test: Likewise.
+
+2011-04-23 Stefano Lattarini <address@hidden>
+
java coverage: add test on uninstall with JAVA primary
* tests/java-uninstall.test: New test.
* tests/Makefile.am (TESTS): Update.
diff --git a/tests/javaprim.test b/tests/javaprim.test
index aa1506b..53d7ac2 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -14,16 +14,23 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure JAVA variable can be defined.
+# Test to make sure JAVA variable can be defined by AC_SUBST.
. ./defs || Exit 1
-echo 'AC_SUBST(JAVA)' >> configure.in
+cat >> configure.in << 'END'
+AC_SUBST([JAVA])
+END
cat > Makefile.am << 'END'
javadir = $(datadir)/java
java_JAVA = a.java b.java c.java
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
+
+grep -i java Makefile.in # For debugging.
+grep '^JAVA = address@hidden@ *$' Makefile.in
+
+:
diff --git a/tests/javasubst.test b/tests/javasubst.test
index d018645..483da81 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -14,18 +14,25 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure redefining JAVAC works.
+# Test to make sure redefining JAVAC with AC_SUBST works.
. ./defs || Exit 1
-echo 'AC_SUBST(JAVAC)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_SUBST([JAVAC])
+END
cat > Makefile.am << 'END'
javadir = $(datadir)/java
java_JAVA = a.java b.java c.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
+
+grep -i java Makefile.in # For debugging.
+grep '^JAVAC = address@hidden@ *$' Makefile.in
-grep 'address@hidden@' Makefile.in
+:
--
1.7.2.3
- [FYI 0/8] More Java patches (mostly testsuite-related), Stefano Lattarini, 2011/04/26
- [FYI 2/8] java tests: require java compiler more properly, Stefano Lattarini, 2011/04/26
- [FYI 3/8] java coverage: add test on uninstall with JAVA primary, Stefano Lattarini, 2011/04/26
- [FYI 1/8] java: allow both JAVA and nobase_JAVA in the same Makefile.am, Stefano Lattarini, 2011/04/26
- [FYI 4/8] java tests: tweak and make stricter a couple of tests,
Stefano Lattarini <=
- [FYI 5/8] test defs: new requirement for the default java interpreter, Stefano Lattarini, 2011/04/26
- [FYI 6/8] java coverage: try to build and run a java program, Stefano Lattarini, 2011/04/26
- [FYI 7/8] java coverage: test rebuild rules for java, Stefano Lattarini, 2011/04/26
- [FYI 8/8] java coverage: test JAVACFLAGS and AM_JAVACFLAGS, Stefano Lattarini, 2011/04/26