diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 14:52:21 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 15:01:15 +0200 |
| commit | 062aeb245e68208dccb3ccc9b28e100a81dbc79b (patch) | |
| tree | 916ca4ae612169af518ca3c4b81ceb2e94567d6d /t/java-no-duplicate.sh | |
| parent | 488de31efa525d864ad56cd023f3b33c83101088 (diff) | |
| parent | 3a1a8c6d3cb46bfe65b715ddd8a3e0d7e27e1bf7 (diff) | |
| download | automake-062aeb245e68208dccb3ccc9b28e100a81dbc79b.tar.gz | |
Merge branch 'maint'
* maint:
tests: automatic re-execution works for non-POSIX shells too
tests: use more POSIX shell features our test scripts
+ Extra non-trivial edits:
* t/ax/test-init.sh: Apply the diffs between past versions of
'defs' in maint and in master; i.e., remove handling of $required
entries 'texi2dvi-o' and 'makeinfo-html', and adjust to the fact
that the parallel testsuite harness is now the default.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/java-no-duplicate.sh')
| -rwxr-xr-x | t/java-no-duplicate.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh index 416fdb9c7..d7ea5f29f 100755 --- a/t/java-no-duplicate.sh +++ b/t/java-no-duplicate.sh @@ -36,10 +36,10 @@ $EGREP -i '\.stamp|\.class|java|classpath' Makefile.in # For debugging. for var in JAVAC JAVAROOT CLASSPATH_ENV am__java_sources; do grep "^$var =" Makefile.in - test `grep -c "^[$sp$tab]*$var[$sp$tab]*=" Makefile.in` = 1 + test $(grep -c "^[$sp$tab]*$var[$sp$tab]*=" Makefile.in) -eq 1 done grep '^classjava\.stamp:' Makefile.in -test `grep -c "class.*java.*\.stamp.*:" Makefile.in` = 1 +test $(grep -c "class.*java.*\.stamp.*:" Makefile.in) -eq 1 : |