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/dd | |
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/dd')
-rwxr-xr-x | tests/dd/bytes.sh | 2 | ||||
-rwxr-xr-x | tests/dd/direct.sh | 2 | ||||
-rwxr-xr-x | tests/dd/misc.sh | 2 | ||||
-rwxr-xr-x | tests/dd/nocache.sh | 2 | ||||
-rwxr-xr-x | tests/dd/not-rewound.sh | 2 | ||||
-rwxr-xr-x | tests/dd/reblock.sh | 2 | ||||
-rwxr-xr-x | tests/dd/skip-seek-past-dev.sh | 2 | ||||
-rwxr-xr-x | tests/dd/skip-seek-past-file.sh | 2 | ||||
-rwxr-xr-x | tests/dd/skip-seek2.sh | 2 | ||||
-rwxr-xr-x | tests/dd/sparse.sh | 2 | ||||
-rwxr-xr-x | tests/dd/stderr.sh | 2 | ||||
-rwxr-xr-x | tests/dd/unblock-sync.sh | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/tests/dd/bytes.sh b/tests/dd/bytes.sh index 2d40f0641..d11051893 100755 --- a/tests/dd/bytes.sh +++ b/tests/dd/bytes.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_ dd # count_bytes diff --git a/tests/dd/direct.sh b/tests/dd/direct.sh index c231bee30..a00f1cd20 100755 --- a/tests/dd/direct.sh +++ b/tests/dd/direct.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_ dd truncate -s 8192 in || framework_failure_ diff --git a/tests/dd/misc.sh b/tests/dd/misc.sh index 52a5b2081..9a9bba1ea 100755 --- a/tests/dd/misc.sh +++ b/tests/dd/misc.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_ dd tmp_in=dd-in diff --git a/tests/dd/nocache.sh b/tests/dd/nocache.sh index 274bb8a03..5849b2852 100755 --- a/tests/dd/nocache.sh +++ b/tests/dd/nocache.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_ dd # This should not call posix_fadvise diff --git a/tests/dd/not-rewound.sh b/tests/dd/not-rewound.sh index 5364f907f..d469e5b93 100755 --- a/tests/dd/not-rewound.sh +++ b/tests/dd/not-rewound.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_ dd diff --git a/tests/dd/reblock.sh b/tests/dd/reblock.sh index 92253fb19..68e4a56d0 100755 --- a/tests/dd/reblock.sh +++ b/tests/dd/reblock.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_ dd # 2 short reads -> 1 full write + 1 partial write diff --git a/tests/dd/skip-seek-past-dev.sh b/tests/dd/skip-seek-past-dev.sh index f4184b1bf..5f6ba9de2 100755 --- a/tests/dd/skip-seek-past-dev.sh +++ b/tests/dd/skip-seek-past-dev.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_ dd # need write access to local device diff --git a/tests/dd/skip-seek-past-file.sh b/tests/dd/skip-seek-past-file.sh index 0a8e1fdc5..c728b3a52 100755 --- a/tests/dd/skip-seek-past-file.sh +++ b/tests/dd/skip-seek-past-file.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_ dd require_sparse_support_ # for 'truncate --size=$OFF_T_MAX' eval $(getlimits) # for OFF_T limits diff --git a/tests/dd/skip-seek2.sh b/tests/dd/skip-seek2.sh index 7f5e0560f..d01e1effa 100755 --- a/tests/dd/skip-seek2.sh +++ b/tests/dd/skip-seek2.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_ dd diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh index 35ddda91e..0c48140eb 100755 --- a/tests/dd/sparse.sh +++ b/tests/dd/sparse.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_ dd require_sparse_support_ diff --git a/tests/dd/stderr.sh b/tests/dd/stderr.sh index 2c062787d..81e9e554e 100755 --- a/tests/dd/stderr.sh +++ b/tests/dd/stderr.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_ dd p=$abs_top_builddir diff --git a/tests/dd/unblock-sync.sh b/tests/dd/unblock-sync.sh index 68239f228..d185609e9 100755 --- a/tests/dd/unblock-sync.sh +++ b/tests/dd/unblock-sync.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_ dd printf 000100020003xx > in || framework_failure_ |