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/mv/acl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/mv/acl.sh') diff --git a/tests/mv/acl.sh b/tests/mv/acl.sh index 2354ed967..9fe26e4b9 100755 --- a/tests/mv/acl.sh +++ b/tests/mv/acl.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_ mv getfacl setfacl require_acl_ @@ -27,7 +27,7 @@ grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || skip_ "insufficient ACL support" cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" touch file || framework_failure_ t1=$other_partition_tmpdir/t1 -- cgit v1.2.3-54-g00ecf