diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-27 20:46:32 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-27 20:46:32 +0100 |
| commit | 10ebd158644c2266607943de90a817e4f23c96bc (patch) | |
| tree | 81fdcbe054b8ddf7689dbeca81852ce65467b55b /t/amhello-binpkg.sh | |
| parent | 27954741470878f637c152a2666187ce2807abb1 (diff) | |
| parent | 54ec1e6b080c00d3b3f0b53fc15389a58abcb53a (diff) | |
| download | automake-10ebd158644c2266607943de90a817e4f23c96bc.tar.gz | |
Merge branch 'maint'
* maint:
news: we'll remove AM_PROG_MKDIR in 1.14, not 1.13
tests: give few vala tests more significant names
vala tests: don't use the 'posix' profile, it's no longer supported
news: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5
news: document the fix for automake bug#10227
tests: fix a spurious testsuite failure on Solaris
python: make installed modules find by default on Debian and Ubuntu
Diffstat (limited to 't/amhello-binpkg.sh')
| -rwxr-xr-x | t/amhello-binpkg.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh index c87717c74..58d0fdd93 100755 --- a/t/amhello-binpkg.sh +++ b/t/amhello-binpkg.sh @@ -44,8 +44,8 @@ if tar --version </dev/null | grep GNU; then END else : Be laxer with other tar implementations, to avoid spurious failures. - $EGREP '(^| )\./usr/bin/hello'$EXEEXT'( |$)' tar.got - $EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got + $EGREP '(^| )(\./)?usr/bin/hello'$EXEEXT'( |$)' tar.got + $EGREP '(^| )(\./)?usr/share/doc/amhello/README( |$)' tar.got fi : |