From 21b5147fd8ee493727e2a3ca17b3bf695c5024d3 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 2 Sep 2012 21:55:12 +0200 Subject: 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. --- tests/mkdir/p-1.sh | 2 +- tests/mkdir/p-2.sh | 2 +- tests/mkdir/p-3.sh | 2 +- tests/mkdir/p-slashdot.sh | 2 +- tests/mkdir/p-thru-slink.sh | 2 +- tests/mkdir/p-v.sh | 2 +- tests/mkdir/parents.sh | 2 +- tests/mkdir/perm.sh | 2 +- tests/mkdir/selinux.sh | 2 +- tests/mkdir/special-1.sh | 2 +- tests/mkdir/t-slash.sh | 2 +- tests/mkdir/writable-under-readonly.sh | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/mkdir') diff --git a/tests/mkdir/p-1.sh b/tests/mkdir/p-1.sh index cd8e67606..0ae322c58 100755 --- a/tests/mkdir/p-1.sh +++ b/tests/mkdir/p-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkdir --parents "$(pwd)/t" || fail=1 diff --git a/tests/mkdir/p-2.sh b/tests/mkdir/p-2.sh index d0c487ec9..6ddedbc66 100755 --- a/tests/mkdir/p-2.sh +++ b/tests/mkdir/p-2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkdir --parents "$(pwd)/t/u" || fail=1 diff --git a/tests/mkdir/p-3.sh b/tests/mkdir/p-3.sh index 7031b2ede..a80fa379c 100755 --- a/tests/mkdir/p-3.sh +++ b/tests/mkdir/p-3.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_root_ diff --git a/tests/mkdir/p-slashdot.sh b/tests/mkdir/p-slashdot.sh index 76d21d055..e59198a6a 100755 --- a/tests/mkdir/p-slashdot.sh +++ b/tests/mkdir/p-slashdot.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir diff --git a/tests/mkdir/p-thru-slink.sh b/tests/mkdir/p-thru-slink.sh index 3f5993248..3c8baf68f 100755 --- a/tests/mkdir/p-thru-slink.sh +++ b/tests/mkdir/p-thru-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 . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir ln -s . slink || framework_failure_ diff --git a/tests/mkdir/p-v.sh b/tests/mkdir/p-v.sh index d6dcfdd87..ea372464c 100755 --- a/tests/mkdir/p-v.sh +++ b/tests/mkdir/p-v.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkdir -pv foo/a/b/c/d >out || fail=1 diff --git a/tests/mkdir/parents.sh b/tests/mkdir/parents.sh index 0543e675e..876c5a049 100755 --- a/tests/mkdir/parents.sh +++ b/tests/mkdir/parents.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_setgid_ diff --git a/tests/mkdir/perm.sh b/tests/mkdir/perm.sh index f9b207f81..3cdd37f84 100755 --- a/tests/mkdir/perm.sh +++ b/tests/mkdir/perm.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_setgid_ diff --git a/tests/mkdir/selinux.sh b/tests/mkdir/selinux.sh index 763236259..bb1aab97b 100755 --- a/tests/mkdir/selinux.sh +++ b/tests/mkdir/selinux.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkfifo mknod # Note: on an SELinux/enforcing system running mcstransd older than diff --git a/tests/mkdir/special-1.sh b/tests/mkdir/special-1.sh index d478930eb..d9305bb53 100755 --- a/tests/mkdir/special-1.sh +++ b/tests/mkdir/special-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir set_mode_string=u=rwx,g=rx,o=w,-s,+t diff --git a/tests/mkdir/t-slash.sh b/tests/mkdir/t-slash.sh index 7b3c1ba30..5645a077c 100755 --- a/tests/mkdir/t-slash.sh +++ b/tests/mkdir/t-slash.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir diff --git a/tests/mkdir/writable-under-readonly.sh b/tests/mkdir/writable-under-readonly.sh index 93e46d5b2..16f4a9279 100755 --- a/tests/mkdir/writable-under-readonly.sh +++ b/tests/mkdir/writable-under-readonly.sh @@ -24,7 +24,7 @@ # # Demonstrate the problem, as root: -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir require_root_ -- cgit v1.2.3-70-g09d2