From 58fb7bf3e5f514b4a0595a7eea6732d6c816e29a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 25 Dec 2013 16:57:07 +0100 Subject: [PATCH] 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 --- t/instdat.sh | 3 ++- t/instdat2.sh | 5 ++--- t/instsh.sh | 6 ++++-- t/instsh3.sh | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/t/instdat.sh b/t/instdat.sh index e030b904c..64e0c7f10 100644 --- 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 1a55e8e62..fcca61900 100644 --- 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 3d84245c9..33cf5f5aa 100644 --- 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 d69f225d0..a53e21df7 100644 --- 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 + +: -- 2.47.2