diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-02 21:55:12 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-09-05 08:48:29 +0200 |
commit | 21b5147fd8ee493727e2a3ca17b3bf695c5024d3 (patch) | |
tree | b14cc2e5d51d761e9c825e0c0dd56f7fdce85cea /tests/du | |
parent | 24fb6d91b6b5b460d5d0b4f5c76d4a954f928040 (diff) | |
download | coreutils-21b5147fd8ee493727e2a3ca17b3bf695c5024d3.tar.xz |
build: don't use recursive make for tests/ subdirectory
* Makefile.am (SUBDIRS): Remove 'tests'.
(include): The '$(top_srcdir)/tests/local.mk' file.
(check-root): Remove this convenience target, it's no longer needed
now that the "real" check-root target once in 'tests/Makefile' will
land in the top-level makefile.
* configure.ac (AC_CONFIG_FILES): Remove 'tests/Makefile'.
* tests/Makefile.am: Rename ...
* tests/local.mk: ... like this, with a lot of adjustments.
* tests/init.cfg: Move ...
* init.cfg: ... here. This is necessary, for a limitation of the
gnulib-provided 'tests/init.sh', which unconditionally look for
'init.cfg' in the $(srcdir) directory.
* tests/*/*.sh: Adjust: expect init.sh to be in '$srcdir/tests',
not in '$srcdir', and extend $PATH with './src', not with '../src'.
* tests/Coreutils.pm: Adjust similarly.
* tests/pr/pr-tests.pl ($pfx): Likewise.
Diffstat (limited to 'tests/du')
-rwxr-xr-x | tests/du/2g.sh | 2 | ||||
-rwxr-xr-x | tests/du/8gb.sh | 2 | ||||
-rwxr-xr-x | tests/du/basic.sh | 2 | ||||
-rwxr-xr-x | tests/du/bigtime.sh | 2 | ||||
-rwxr-xr-x | tests/du/bind-mount-dir-cycle.sh | 2 | ||||
-rwxr-xr-x | tests/du/deref-args.sh | 2 | ||||
-rwxr-xr-x | tests/du/deref.sh | 2 | ||||
-rwxr-xr-x | tests/du/exclude.sh | 2 | ||||
-rwxr-xr-x | tests/du/fd-leak.sh | 2 | ||||
-rwxr-xr-x | tests/du/files0-from-dir.sh | 2 | ||||
-rwxr-xr-x | tests/du/hard-link.sh | 2 | ||||
-rwxr-xr-x | tests/du/inacc-dest.sh | 2 | ||||
-rwxr-xr-x | tests/du/inacc-dir.sh | 2 | ||||
-rwxr-xr-x | tests/du/inaccessible-cwd.sh | 2 | ||||
-rwxr-xr-x | tests/du/long-from-unreadable.sh | 2 | ||||
-rwxr-xr-x | tests/du/long-sloop.sh | 2 | ||||
-rwxr-xr-x | tests/du/max-depth.sh | 2 | ||||
-rwxr-xr-x | tests/du/move-dir-while-traversing.sh | 2 | ||||
-rwxr-xr-x | tests/du/no-deref.sh | 2 | ||||
-rwxr-xr-x | tests/du/no-x.sh | 2 | ||||
-rwxr-xr-x | tests/du/one-file-system.sh | 4 | ||||
-rwxr-xr-x | tests/du/restore-wd.sh | 2 | ||||
-rwxr-xr-x | tests/du/slash.sh | 2 | ||||
-rwxr-xr-x | tests/du/slink.sh | 2 | ||||
-rwxr-xr-x | tests/du/trailing-slash.sh | 2 | ||||
-rwxr-xr-x | tests/du/two-args.sh | 2 |
26 files changed, 27 insertions, 27 deletions
diff --git a/tests/du/2g.sh b/tests/du/2g.sh index 96cf62d7c..010d8cebb 100755 --- a/tests/du/2g.sh +++ b/tests/du/2g.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Creating a 2GB file counts as 'very expensive'. diff --git a/tests/du/8gb.sh b/tests/du/8gb.sh index 556423e3c..c000718f0 100755 --- a/tests/du/8gb.sh +++ b/tests/du/8gb.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du require_sparse_support_ diff --git a/tests/du/basic.sh b/tests/du/basic.sh index d8acf6420..b05508f2f 100755 --- a/tests/du/basic.sh +++ b/tests/du/basic.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p a/b d d/sub || framework_failure_ diff --git a/tests/du/bigtime.sh b/tests/du/bigtime.sh index 964fb710a..70f69bf2a 100755 --- a/tests/du/bigtime.sh +++ b/tests/du/bigtime.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src export LC_ALL=C export TZ=UTC0 diff --git a/tests/du/bind-mount-dir-cycle.sh b/tests/du/bind-mount-dir-cycle.sh index 516ceae58..d8d381afe 100755 --- a/tests/du/bind-mount-dir-cycle.sh +++ b/tests/du/bind-mount-dir-cycle.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du require_root_ diff --git a/tests/du/deref-args.sh b/tests/du/deref-args.sh index 098e01a46..b4761e5c8 100755 --- a/tests/du/deref-args.sh +++ b/tests/du/deref-args.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/a || framework_failure_ diff --git a/tests/du/deref.sh b/tests/du/deref.sh index 90b765039..77c61c7f3 100755 --- a/tests/du/deref.sh +++ b/tests/du/deref.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p a/sub || framework_failure_ diff --git a/tests/du/exclude.sh b/tests/du/exclude.sh index cad2d7f89..eba0dd227 100755 --- a/tests/du/exclude.sh +++ b/tests/du/exclude.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p a/b/c a/x/y a/u/v || framework_failure_ diff --git a/tests/du/fd-leak.sh b/tests/du/fd-leak.sh index 84a22760a..cb6865017 100755 --- a/tests/du/fd-leak.sh +++ b/tests/du/fd-leak.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Call this an expensive test. It's not that expensive, but command line diff --git a/tests/du/files0-from-dir.sh b/tests/du/files0-from-dir.sh index 86bfe269b..20eb82f7e 100755 --- a/tests/du/files0-from-dir.sh +++ b/tests/du/files0-from-dir.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du wc mkdir dir diff --git a/tests/du/hard-link.sh b/tests/du/hard-link.sh index 0e0641e75..ede8bc8af 100755 --- a/tests/du/hard-link.sh +++ b/tests/du/hard-link.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/sub diff --git a/tests/du/inacc-dest.sh b/tests/du/inacc-dest.sh index c9c709759..54010b343 100755 --- a/tests/du/inacc-dest.sh +++ b/tests/du/inacc-dest.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du skip_if_root_ diff --git a/tests/du/inacc-dir.sh b/tests/du/inacc-dir.sh index 8395c56e8..f03d054ba 100755 --- a/tests/du/inacc-dir.sh +++ b/tests/du/inacc-dir.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du skip_if_root_ diff --git a/tests/du/inaccessible-cwd.sh b/tests/du/inaccessible-cwd.sh index bfc8cf92e..0372ad084 100755 --- a/tests/du/inaccessible-cwd.sh +++ b/tests/du/inaccessible-cwd.sh @@ -20,7 +20,7 @@ # Before the switch to an fts-based implementation in coreutils 5.0.92, # this test would fail. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Skip this test if your system has neither the openat-style functions diff --git a/tests/du/long-from-unreadable.sh b/tests/du/long-from-unreadable.sh index 7fc129c17..8362e98bc 100755 --- a/tests/du/long-from-unreadable.sh +++ b/tests/du/long-from-unreadable.sh @@ -28,7 +28,7 @@ # on Linux+PROC_FS systems because its fts implementation would revert # unnecessarily to using FTS_NOCHDIR mode in this corner case. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du proc_file=/proc/self/fd diff --git a/tests/du/long-sloop.sh b/tests/du/long-sloop.sh index 48e2e30ac..583009d83 100755 --- a/tests/du/long-sloop.sh +++ b/tests/du/long-sloop.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Create lots of directories, each containing a single symlink diff --git a/tests/du/max-depth.sh b/tests/du/max-depth.sh index 30671c4d8..25e2a1289 100755 --- a/tests/du/max-depth.sh +++ b/tests/du/max-depth.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src mkdir -p a/b/c/d/e || framework_failure_ printf 'a/b/c\na/b\na\n' > exp || framework_failure_ diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh index 4f603a0e1..0998d8c32 100755 --- a/tests/du/move-dir-while-traversing.sh +++ b/tests/du/move-dir-while-traversing.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # We use a python-inotify script, so... diff --git a/tests/du/no-deref.sh b/tests/du/no-deref.sh index 2f2055123..e476d8b29 100755 --- a/tests/du/no-deref.sh +++ b/tests/du/no-deref.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/a/b || framework_failure_ diff --git a/tests/du/no-x.sh b/tests/du/no-x.sh index 28f797685..420ae4be5 100755 --- a/tests/du/no-x.sh +++ b/tests/du/no-x.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du skip_if_root_ diff --git a/tests/du/one-file-system.sh b/tests/du/one-file-system.sh index 110080f02..a0e6f0e06 100755 --- a/tests/du/one-file-system.sh +++ b/tests/du/one-file-system.sh @@ -16,10 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" mkdir -p b/c y/z d "$other_partition_tmpdir/x" || framework_failure_ ln -s "$other_partition_tmpdir/x" d || framework_failure_ diff --git a/tests/du/restore-wd.sh b/tests/du/restore-wd.sh index 19ed5fa00..836ce05b1 100755 --- a/tests/du/restore-wd.sh +++ b/tests/du/restore-wd.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir a b || framework_failure_ diff --git a/tests/du/slash.sh b/tests/du/slash.sh index 95012411a..25820c7bb 100755 --- a/tests/du/slash.sh +++ b/tests/du/slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du require_readable_root_ diff --git a/tests/du/slink.sh b/tests/du/slink.sh index 674e6a224..eba1e4526 100755 --- a/tests/du/slink.sh +++ b/tests/du/slink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Determine if '.' is on a local (would non-NFS be sufficient?) file system. diff --git a/tests/du/trailing-slash.sh b/tests/du/trailing-slash.sh index 4efda6c73..feb9d0641 100755 --- a/tests/du/trailing-slash.sh +++ b/tests/du/trailing-slash.sh @@ -19,7 +19,7 @@ # Before coreutils-4.5.3, it would remove a single trailing slash. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/1/2 || framework_failure_ diff --git a/tests/du/two-args.sh b/tests/du/two-args.sh index 10c0a0578..6a6bbec18 100755 --- a/tests/du/two-args.sh +++ b/tests/du/two-args.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Run this test from a sub-directory one level deeper than normal, |