tests: some cosmetic fixes

* t/instdat.sh: Here.
* t/instdat2.sh: And here.
* t/instsh.sh: And here.
* t/instsh3.sh: And here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/instdat.sh b/t/instdat.sh
index e030b904c342caed325cf281191ade498a4d7593..64e0c7f10de3ad81f1745c1aed6b6506d7ccbf81 100644 (file)
--- a/t/instdat.sh
+++ b/t/instdat.sh
@@ -29,4 +29,5 @@ $ACLOCAL
 $AUTOMAKE
 
 grep '^DATA =' Makefile.in | grep 'INSTALL_DATA' && exit 1
-exit 0
+
+:

diff --git a/t/instdat2.sh b/t/instdat2.sh
index 1a55e8e62adf5e6695be57a5c9e6956dfd355568..fcca6190070b0c70c18e94c4c367d1af0a98b142 100644 (file)
--- a/t/instdat2.sh
+++ b/t/instdat2.sh
@@ -62,7 +62,7 @@ pkgdata_SCRIPTS = script
 ##pkginclude_SCRIPTS = script
 EOF
 
-$ACLOCAL || exit 1
+$ACLOCAL
 $AUTOMAKE
 
 # install-SCRIPTS targets.
@@ -75,7 +75,6 @@ EOF
 
 diff expected produced
 
-
 # install-exec targets.
 sed -n '/^install-exec-am/,/^  /p' Makefile.in > produced
 
@@ -86,4 +85,4 @@ EOF
 
 diff expected produced
 
-exit 0
+:

diff --git a/t/instsh.sh b/t/instsh.sh
index 3d84245c94c42a289de0c707633a023c287a74f2..33cf5f5aab9a6f6dfd79d1b7be535fe2c7629fb3 100644 (file)
--- a/t/instsh.sh
+++ b/t/instsh.sh
@@ -30,10 +30,12 @@ mv Makefile.am configure.ac frob/
 cd frob
 
 $ACLOCAL
-$AUTOMAKE --add-missing > output 2>&1
+$AUTOMAKE --add-missing >output 2>&1 || { cat output; exit 1; }
+cat output
 
 # Only one '/' should appear in the output.
-cat output
 grep '/.*/' output && exit 1
 
 test -f install-sh
+
+:

diff --git a/t/instsh3.sh b/t/instsh3.sh
index d69f225d0064d3df48025567bf6d332eeeec3741..a53e21df79756f34e593136f5c81807a3e633ac5 100644 (file)
--- a/t/instsh3.sh
+++ b/t/instsh3.sh
@@ -21,7 +21,7 @@ required=non-root
 . test-init.sh
 
 # Solaris /usr/ucb/touch does not accept -t.
-touch -t $old_timestamp foo \
+touch -t "$old_timestamp" foo \
   || skip_ "touch utility doesn't accept '-t' option"
 
 get_shell_script install-sh
@@ -41,3 +41,5 @@ diff file d1/file
 ./install-sh -C -m 444 file d1
 test -r d1/file
 test ! -w d1/file
+
+: