From c6c9e8730e23af5d96a3b25331b0510112422abb Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 27 May 2008 13:24:20 +0200 Subject: prefer abs_srcdir over abs_top_srcdir, ... so that e.g., tests/* may refer to absolute names without hard-coding the name of the containing directory (tests/, here). * tests/check.mk (TESTS_ENVIRONMENT): Define abs_srcdir. * tests/pr/pr-tests: Use $abs_srcdir/pr not $abs_top_srcdir/tests/pr. * tests/chmod/c-option: Use $abs_srcdir, not $abs_top_srcdir/tests. * tests/cp/cp-parents: Likewise. * tests/mkdir/parents: Likewise. * tests/mkdir/perm: Likewise. * tests/mv/acl: Likewise. * tests/mv/backup-is-src: Likewise. * tests/mv/hard-link-1: Likewise. * tests/mv/into-self-2: Likewise. * tests/mv/leak-fd: Likewise. * tests/mv/mv-special-1: Likewise. * tests/mv/part-fail: Likewise. * tests/mv/part-hardlink: Likewise. * tests/mv/part-rename: Likewise. * tests/mv/part-symlink: Likewise. * tests/mv/partition-perm: Likewise. * tests/mv/sticky-to-xpart: Likewise. * tests/mv/to-symlink: Likewise. * tests/rm/one-file-system: Likewise. * tests/sample-test: Likewise. --- tests/mv/acl | 2 +- tests/mv/backup-is-src | 2 +- tests/mv/hard-link-1 | 2 +- tests/mv/into-self-2 | 2 +- tests/mv/leak-fd | 2 +- tests/mv/mv-special-1 | 2 +- tests/mv/part-fail | 2 +- tests/mv/part-hardlink | 2 +- tests/mv/part-rename | 2 +- tests/mv/part-symlink | 2 +- tests/mv/partition-perm | 2 +- tests/mv/sticky-to-xpart | 2 +- tests/mv/to-symlink | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'tests/mv') diff --git a/tests/mv/acl b/tests/mv/acl index 858c2aff9..536391a68 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -32,7 +32,7 @@ grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && skip_test_ "insufficient ACL support" cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" touch file || framework_failure t1=$other_partition_tmpdir/t1 diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src index 3335d0758..3c41ecba8 100755 --- a/tests/mv/backup-is-src +++ b/tests/mv/backup-is-src @@ -23,7 +23,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" a="$other_partition_tmpdir/a" a2="$other_partition_tmpdir/a~" diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 index 6afaeade6..fd586aeca 100755 --- a/tests/mv/hard-link-1 +++ b/tests/mv/hard-link-1 @@ -24,7 +24,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" dir=hlink diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 index 32801a3a4..ffc97c316 100755 --- a/tests/mv/into-self-2 +++ b/tests/mv/into-self-2 @@ -25,7 +25,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" file="$other_partition_tmpdir/file" symlink=symlink diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd index 1ecdb20c4..127a826ab 100755 --- a/tests/mv/leak-fd +++ b/tests/mv/leak-fd @@ -26,7 +26,7 @@ fi . $top_srcdir/tests/test-lib.sh skip_if_root_ cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" # This test is relatively expensive, and might well evoke a # framework-failure on systems with a smaller command-line length diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 index d883f5b12..ff4869fc2 100755 --- a/tests/mv/mv-special-1 +++ b/tests/mv/mv-special-1 @@ -24,7 +24,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" null=mv-null dir=mv-dir diff --git a/tests/mv/part-fail b/tests/mv/part-fail index e5396c2c6..fdbab1d7d 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -27,7 +27,7 @@ fi . $top_srcdir/tests/test-lib.sh skip_if_root_ cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" touch k $other_partition_tmpdir/k || framework_failure chmod u-w $other_partition_tmpdir || framework_failure diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink index fed5bcf34..8f83fcf27 100755 --- a/tests/mv/part-hardlink +++ b/tests/mv/part-hardlink @@ -26,7 +26,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" touch f || framework_failure ln f g || framework_failure diff --git a/tests/mv/part-rename b/tests/mv/part-rename index 30913ec10..009c6d443 100755 --- a/tests/mv/part-rename +++ b/tests/mv/part-rename @@ -25,7 +25,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" mkdir foo || framework_failure diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink index 0b7e21347..68c46f9ea 100755 --- a/tests/mv/part-symlink +++ b/tests/mv/part-symlink @@ -25,7 +25,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" pwd_tmp=`pwd` diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm index ca32e473f..a8ca44c8e 100755 --- a/tests/mv/partition-perm +++ b/tests/mv/partition-perm @@ -23,7 +23,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" : > file chmod a=rwx file diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index d0e90c1ac..38f383692 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -28,7 +28,7 @@ fi require_root_ cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" # Set up to run a test where non-root user tries to move a root-owned # file from a sticky tmpdir to a directory owned by that user on diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink index b265a3e31..12f1447d1 100755 --- a/tests/mv/to-symlink +++ b/tests/mv/to-symlink @@ -24,7 +24,7 @@ fi . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_top_srcdir/tests/other-fs-tmpdir" +. "$abs_srcdir/other-fs-tmpdir" rem_file="$other_partition_tmpdir/file" rem_symlink="$other_partition_tmpdir/symlink" -- cgit v1.2.3-54-g00ecf