From 6e713425a0dcede167924e7691e95ab5e54e399c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 14 Jun 2012 13:13:58 +0200 Subject: tests: use more POSIX shell features our test scripts Since commit 'v1.12-36-g2d68fd9' of 2012-05-07, "configure: search a sturdy POSIX shell to be used in the testsuite", the shell running our test script is assured to be a POSIX-conforming shell, so we can use the more modern and flexible idioms and features that we couldn't use when we also aimed at compatibility with non-POSIX Bourne shells, like Solaris /bin/sh. * t/README: Suggest to use POSIX shell features liberally in test cases, with possible exception of Makefile recipes and configure shell code. * Several tests: Adjust to use more POSIX shell features; e.g., $(...) rather than `...`, $((...)) rather than `expr ...`, "if ! CMD; then ..." instead of "if CMD; then :; else ...", and so on. In several places, when using the 'test' built-in, prefer '-eq' over '=' for numeric comparisons, and prefer "grep -c PATTERN FILE" over "grep PATTERN FILE | wc -l". Throw in other low-hanging easy improvements and fixlets while we are at it. * t/ax/depcomp.sh, t/ax/tap-summary-aux.sh, t/ax/tap-functions.sh, defs, defs-static.in: Likewise. Signed-off-by: Stefano Lattarini --- t/test-driver-custom-xfail-tests.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 't/test-driver-custom-xfail-tests.sh') diff --git a/t/test-driver-custom-xfail-tests.sh b/t/test-driver-custom-xfail-tests.sh index 14568c096..d8455deab 100755 --- a/t/test-driver-custom-xfail-tests.sh +++ b/t/test-driver-custom-xfail-tests.sh @@ -143,8 +143,8 @@ $AUTOMAKE $MAKE check >stdout || { cat stdout; Exit 1; } cat stdout -test `grep -c '^PASS:' stdout` -eq 3 -test `grep -c '^XFAIL:' stdout` -eq 13 +test $(grep -c '^PASS:' stdout) -eq 3 +test $(grep -c '^XFAIL:' stdout) -eq 13 for dir in sub1 sub2; do cd $dir @@ -152,9 +152,9 @@ for dir in sub1 sub2; do cp x2.test pass.test $MAKE check >stdout && { cat stdout; Exit 1; } cat stdout - test "`cat pass.trs`" = ":test-result: FAIL" - test "`cat x1.trs`" = ":test-result: XPASS" - test "`cat x2.trs`" = ":test-result: XFAIL" + test "$(cat pass.trs)" = ":test-result: FAIL" + test "$(cat x1.trs)" = ":test-result: XPASS" + test "$(cat x2.trs)" = ":test-result: XFAIL" grep '^FAIL: pass\.test$' stdout grep '^XPASS: x1\.test$' stdout grep '^XFAIL: x2\.test$' stdout -- cgit v1.2.1