From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 25 Oct 2011 10:04:46 +0000 (+0200)
Subject: tests: remove redundant `set -e', and other minor improvements
X-Git-Tag: v1.11b~257^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc29c6174a7d68a70d33e5ff5af68e3e0ec0be54;p=platform%2Fupstream%2Fautomake.git

tests: remove redundant `set -e', and other minor improvements

* tests/dejagnu-absolute-builddir.test: Do not set the `errexit'
shell flag, as it is already set by `tests/defs'.
* tests/dejagnu-relative-srcdir.test: Likewise.
* tests/dejagnu-siteexp-append.test: Likewise.
* tests/dejagnu-siteexp-useredit.test: Likewise, and fix a typo
in comments.
* tests/dejagnu-siteexp-extend.test: Likewise, and prefer the
use of `$distdir' over hard-coded `$me-1.0'.  Also ...
(write_check_for): ... use `unindent' when writing from an
here-doc, for better code indentation.
---

diff --git a/ChangeLog b/ChangeLog
index 4591492..adba25e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: remove redundant `set -e', and other minor improvements
+	* tests/dejagnu-absolute-builddir.test: Do not set the `errexit'
+	shell flag, as it is already set by `tests/defs'.
+	* tests/dejagnu-relative-srcdir.test: Likewise.
+	* tests/dejagnu-siteexp-append.test: Likewise.
+	* tests/dejagnu-siteexp-useredit.test: Likewise, and fix a typo
+	in comments.
+	* tests/dejagnu-siteexp-extend.test: Likewise, and prefer the
+	use of `$distdir' over hard-coded `$me-1.0'.  Also ...
+	(write_check_for): ... use `unindent' when writing from an
+	here-doc, for better code indentation.
+
 2011-10-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	deps: partially revert commit `v1.11-512-geeee551'
diff --git a/tests/dejagnu-absolute-builddir.test b/tests/dejagnu-absolute-builddir.test
index ad9578f..221e796 100755
--- a/tests/dejagnu-absolute-builddir.test
+++ b/tests/dejagnu-absolute-builddir.test
@@ -20,8 +20,6 @@
 required=runtest
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
diff --git a/tests/dejagnu-relative-srcdir.test b/tests/dejagnu-relative-srcdir.test
index 8a70d58..f1ef8a4 100755
--- a/tests/dejagnu-relative-srcdir.test
+++ b/tests/dejagnu-relative-srcdir.test
@@ -20,8 +20,6 @@
 required=runtest
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
diff --git a/tests/dejagnu-siteexp-append.test b/tests/dejagnu-siteexp-append.test
index 7bd34ed..84ec7f6 100755
--- a/tests/dejagnu-siteexp-append.test
+++ b/tests/dejagnu-siteexp-append.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
diff --git a/tests/dejagnu-siteexp-extend.test b/tests/dejagnu-siteexp-extend.test
index 591267e..fbfc57c 100755
--- a/tests/dejagnu-siteexp-extend.test
+++ b/tests/dejagnu-siteexp-extend.test
@@ -20,17 +20,15 @@
 required=runtest
 . ./defs || Exit 1
 
-set -e
-
 write_check_for ()
 {
   echo "send_user \"$1: \$$1\\n\""
-  cat << END
-if { \$$1 == "/$1/" } {
-    pass "test_$1"
-} else {
-    fail "test_$1"
-}
+  unindent << END
+    if { \$$1 == "/$1/" } {
+        pass "test_$1"
+    } else {
+        fail "test_$1"
+    }
 END
 }
 
@@ -154,8 +152,8 @@ grep 'zardoz.*quux' tool.log && Exit 1
 # Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
 # by default.
 $MAKE distdir
-ls -l $me-1.0
-test ! -r $me-1.0/bar.dir/bar
-test ! -r $me-1.0/quux.exp
+ls -l $distdir
+test ! -r $distdir/bar.dir/bar
+test ! -r $distdir/quux.exp
 
 :
diff --git a/tests/dejagnu-siteexp-useredit.test b/tests/dejagnu-siteexp-useredit.test
index a51bc40..a67e55a 100755
--- a/tests/dejagnu-siteexp-useredit.test
+++ b/tests/dejagnu-siteexp-useredit.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
@@ -60,7 +58,7 @@ is_newest site.exp Makefile  # Sanity check.
 grep '|objdir|' site.exp
 test `grep -c '|objdir|' site.exp` -eq 1
 
-# We can done a "more semantic" check if DejaGnu is available.
+# We can do a "more semantic" check if DejaGnu is available.
 if runtest SOMEPROGRAM=someprogram --version; then
   $MAKE check
   grep 'PASS: test_obj' foo.sum