diff options
author | Jim Meyering <meyering@redhat.com> | 2008-04-17 23:34:45 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-04-21 00:01:51 +0200 |
commit | 512e111a926fedbd7dc7b0875ab837dbb7d2a7a6 (patch) | |
tree | f77cdb2c6bfc71f0560cf073324365c0a3e65526 /tests/install | |
parent | d25bf9dceb90dcb91f8af57aff433273c7145ff7 (diff) | |
download | coreutils-512e111a926fedbd7dc7b0875ab837dbb7d2a7a6.tar.xz |
Revamp test-related Makefiles.
One side-effect of this change is that "make check" now works even if
you put "." early in your shell's search PATH (don't do that!).
Remove all test-related Makefile.am files, except those generated
by mk-script. Instead, tests/Makefile.am now lists not only the
tests directly under tests/, but also those in tests/*/ that are
not generated by mk-script, e.g., cp/abuse, cp/acl, mv/i-1, etc.
A lot of these changes are like this:
-. $srcdir/../lang-default
+. $top_srcdir/tests/lang-default
-. $srcdir/../test-lib.sh
+. $top_srcdir/tests/test-lib.sh
* configure.ac (AC_CONFIG_FILES): Remove corresponding Makefiles.
* tests/check.mk (vc_exe_in_TESTS): Relax syntax requirements.
* tests/rwx-to-mode: Remove file. Rewritten as...
* tests/test-lib.sh (rwx_to_mode_): ...this new function.
* tests/Makefile.am (EXTRA_DIST): Remove rwx-to-mode.
(SUBDIRS): Remove each dir with a removed Makefile.am.
(EXTRA_DIST): Add $(TESTS).
(TESTS): Add over 300 entries.
Diffstat (limited to 'tests/install')
-rw-r--r-- | tests/install/Makefile.am | 10 | ||||
-rwxr-xr-x | tests/install/basic-1 | 6 | ||||
-rwxr-xr-x | tests/install/create-leading | 2 | ||||
-rwxr-xr-x | tests/install/d-slashdot | 4 | ||||
-rwxr-xr-x | tests/install/trap | 4 |
5 files changed, 8 insertions, 18 deletions
diff --git a/tests/install/Makefile.am b/tests/install/Makefile.am deleted file mode 100644 index 0ff078485..000000000 --- a/tests/install/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. -TESTS = \ - basic-1 \ - create-leading \ - d-slashdot \ - trap - -EXTRA_DIST = $(TESTS) - -include $(top_srcdir)/tests/check.mk diff --git a/tests/install/basic-1 b/tests/install/basic-1 index ca24a9d22..26ac5ddfb 100755 --- a/tests/install/basic-1 +++ b/tests/install/basic-1 @@ -1,7 +1,7 @@ #! /bin/sh # Basic tests for "install". -# Copyright (C) 1998, 2000-2002, 2004-2007 Free Software Foundation, Inc. +# Copyright (C) 1998, 2000-2002, 2004-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then ginstall --version fi -. $srcdir/../lang-default -. $srcdir/../test-lib.sh +. $top_srcdir/tests/lang-default +. $top_srcdir/tests/test-lib.sh skip_if_root_ dir=dir diff --git a/tests/install/create-leading b/tests/install/create-leading index 66c3995b5..699993863 100755 --- a/tests/install/create-leading +++ b/tests/install/create-leading @@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then ginstall --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot index eb2a9146c..e7bf8ea77 100755 --- a/tests/install/d-slashdot +++ b/tests/install/d-slashdot @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that ginstall -d works with arguments specified with a trailing "/.". -# Copyright (C) 2005-2007 Free Software Foundation, Inc. +# Copyright (C) 2005-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then install --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/install/trap b/tests/install/trap index a4f9fa868..915ad9ea2 100755 --- a/tests/install/trap +++ b/tests/install/trap @@ -2,7 +2,7 @@ # Ensure that `install -s' doesn't infloop when its parent # process traps CHLD signal. -# Copyright (C) 2004-2007 Free Software Foundation, Inc. +# Copyright (C) 2004-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then ginstall --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh fail=0 |