From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 30 Jun 2012 11:42:10 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2f007f0c78e011c5fab60bfad332f6aad0989f1;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix a spurious failure
  configure: fix detection of POSIX shell to work in a VPATH build
  tests: prefer "test ! -e FILE" to check that a file doesn't exist

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

e2f007f0c78e011c5fab60bfad332f6aad0989f1
diff --cc t/parallel-tests-driver-install.sh
index 78dff6b,9940661..e1a2248
--- a/t/parallel-tests-driver-install.sh
+++ b/t/parallel-tests-driver-install.sh
@@@ -45,9 -49,44 +45,9 @@@ cat stderr >&
  
  ls -l . sub my_aux_dir # For debugging.
  test -f my_aux_dir/test-driver
- test ! -r test-driver
- test ! -r sub/test-driver
+ test ! -e test-driver
+ test ! -e sub/test-driver
  
 -grep '^configure\.ac:3:.*installing.*my_aux_dir/test-driver' stderr
 -
 -cd ..
 -
 -: Now try with parallel-tests defined in AUTOMAKE_OPTIONS.
 -
 -mkdir automake-options
 -cd automake-options
 -
 -cat > configure.ac <<END
 -AC_INIT([$me], [1.0])
 -AC_CONFIG_AUX_DIR([build-aux])
 -AM_INIT_AUTOMAKE
 -AC_CONFIG_FILES([dir/GNUmakefile])
 -AC_OUTPUT
 -END
 -
 -mkdir build-aux dir
 -
 -cat > dir/GNUmakefile.am <<END
 -TESTS = foo.test
 -AUTOMAKE_OPTIONS = parallel-tests
 -TESTS += bar.test
 -END
 -
 -$ACLOCAL
 -$AUTOMAKE --add-missing --copy dir/GNUmakefile 2>stderr \
 -  || { cat stderr >&2; exit 1; }
 -cat stderr >&2
 -
 -ls -l . dir build-aux # For debugging.
 -test -f build-aux/test-driver
 -test ! -e test-driver
 -test ! -e dir/test-driver
 -
 -grep '^dir/GNUmakefile\.am:2:.*installing.*build-aux/test-driver' stderr
 +grep '^parallel-tests:.*installing.*my_aux_dir/test-driver' stderr
  
  :