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/install | |
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/install')
-rwxr-xr-x | tests/install/basic-1.sh | 2 | ||||
-rwxr-xr-x | tests/install/create-leading.sh | 2 | ||||
-rwxr-xr-x | tests/install/d-slashdot.sh | 2 | ||||
-rwxr-xr-x | tests/install/install-C-root.sh | 2 | ||||
-rwxr-xr-x | tests/install/install-C-selinux.sh | 2 | ||||
-rwxr-xr-x | tests/install/install-C.sh | 2 | ||||
-rwxr-xr-x | tests/install/strip-program.sh | 2 | ||||
-rwxr-xr-x | tests/install/trap.sh | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/install/basic-1.sh b/tests/install/basic-1.sh index aa80fcf33..08055f5b9 100755 --- a/tests/install/basic-1.sh +++ b/tests/install/basic-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 <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall skip_if_root_ diff --git a/tests/install/create-leading.sh b/tests/install/create-leading.sh index 0ecf4d958..6a7191905 100755 --- a/tests/install/create-leading.sh +++ b/tests/install/create-leading.sh @@ -19,7 +19,7 @@ # Note that the tests below use 'ginstall', not install, because # that's the name of the binary in ../../src. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall diff --git a/tests/install/d-slashdot.sh b/tests/install/d-slashdot.sh index 2abdd57a8..5e6cb55f3 100755 --- a/tests/install/d-slashdot.sh +++ b/tests/install/d-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 <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ install diff --git a/tests/install/install-C-root.sh b/tests/install/install-C-root.sh index 5fbae058a..9a203e989 100755 --- a/tests/install/install-C-root.sh +++ b/tests/install/install-C-root.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_ ginstall require_root_ skip_if_setgid_ diff --git a/tests/install/install-C-selinux.sh b/tests/install/install-C-selinux.sh index db2a5d227..c8a21e944 100755 --- a/tests/install/install-C-selinux.sh +++ b/tests/install/install-C-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 <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall require_selinux_ diff --git a/tests/install/install-C.sh b/tests/install/install-C.sh index 0883d9e6b..c3739713c 100755 --- a/tests/install/install-C.sh +++ b/tests/install/install-C.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_ ginstall skip_if_setgid_ diff --git a/tests/install/strip-program.sh b/tests/install/strip-program.sh index 591614118..d38b4f4c7 100755 --- a/tests/install/strip-program.sh +++ b/tests/install/strip-program.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_ ginstall working_umask_or_skip_ diff --git a/tests/install/trap.sh b/tests/install/trap.sh index e3ccf54ac..ea7153b84 100755 --- a/tests/install/trap.sh +++ b/tests/install/trap.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_ ginstall |