diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 15:34:12 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 15:41:59 +0200 |
| commit | 9c90cf76767e4629349e3cce61dc587185f4eda1 (patch) | |
| tree | 1e9b8f481f6eff8b0e8b9fcbb1d932562f67c833 | |
| parent | 74c0fd3e53c75d08ac4c428b0a2f5d21f189a34b (diff) | |
| download | automake-9c90cf76767e4629349e3cce61dc587185f4eda1.tar.gz | |
tests: fix some spurious failures in VPATH setup
* t/self-check-cleanup.tap: No need to copy the 'ax/t/test-init.sh'
file over in our temporary directory.
* t/self-check-reexec.tap: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rwxr-xr-x | t/self-check-cleanup.tap | 6 | ||||
| -rwxr-xr-x | t/self-check-reexec.tap | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/t/self-check-cleanup.tap b/t/self-check-cleanup.tap index 01636f4be..d379c4380 100755 --- a/t/self-check-cleanup.tap +++ b/t/self-check-cleanup.tap @@ -48,8 +48,6 @@ do_clean_setup () test ! -d $d || chmod u+rwx $d || : done rm -rf t - mkdir -p t/ax - cp "$am_top_builddir"/t/ax/test-init.sh t/ax } do_clean_setup @@ -67,7 +65,7 @@ do_clean_setup # Check that pre-test cleanup works also with directories with # "null" permissions, and containing broken symlinks. -mkdir t/dummy.dir t/dummy.dir/sub +mkdir t t/dummy.dir t/dummy.dir/sub ( cd t/dummy.dir touch file sub/file @@ -124,7 +122,7 @@ if test $have_symlinks = yes; then : > file chmod 000 file - mkdir t/dummy.dir + mkdir t t/dummy.dir (cd t/dummy.dir && ln -s ../../dir ../../file .) command_ok_ "pre-cleanup with testdir with zero-perms symlinks" \ diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap index 3a4bcdaa4..3feeb62e1 100755 --- a/t/self-check-reexec.tap +++ b/t/self-check-reexec.tap @@ -25,15 +25,7 @@ plan_ 32 unset AM_TESTS_REEXEC BASH_VERSION || : -get_test_init_sh () -{ - mkdir -p ${1-.}/t/ax - cp "$am_top_builddir"/t/ax/test-init.sh ${1-.}/t/ax \ - || fatal_ "fetching 't/ax/test-init.sh' from top_builddir" -} - cwd=$(pwd) || fatal_ "getting current working directory" -get_test_init_sh cp "$am_top_builddir"/defs . || fatal_ "fetching 'defs' from top_builddir" # @@ -173,7 +165,6 @@ sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd'|" \ < "$am_top_builddir"/defs-static > defs-static sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd/sub'|" \ < "$am_top_builddir"/defs-static > sub/defs-static -get_test_init_sh sub check_preserve_args () { |