summaryrefslogtreecommitdiff
path: root/tests/touch
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-09-02 21:55:12 +0200
committerJim Meyering <meyering@redhat.com>2012-09-05 08:48:29 +0200
commit21b5147fd8ee493727e2a3ca17b3bf695c5024d3 (patch)
treeb14cc2e5d51d761e9c825e0c0dd56f7fdce85cea /tests/touch
parent24fb6d91b6b5b460d5d0b4f5c76d4a954f928040 (diff)
downloadcoreutils-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/touch')
-rwxr-xr-xtests/touch/60-seconds.sh2
-rwxr-xr-xtests/touch/dangling-symlink.sh2
-rwxr-xr-xtests/touch/dir-1.sh2
-rwxr-xr-xtests/touch/empty-file.sh2
-rwxr-xr-xtests/touch/fail-diag.sh2
-rwxr-xr-xtests/touch/fifo.sh2
-rwxr-xr-xtests/touch/no-create-missing.sh2
-rwxr-xr-xtests/touch/no-dereference.sh2
-rwxr-xr-xtests/touch/no-rights.sh2
-rwxr-xr-xtests/touch/not-owner.sh2
-rwxr-xr-xtests/touch/now-owned-by-other.sh2
-rwxr-xr-xtests/touch/obsolescent.sh2
-rwxr-xr-xtests/touch/read-only.sh2
-rwxr-xr-xtests/touch/relative.sh2
-rwxr-xr-xtests/touch/trailing-slash.sh2
15 files changed, 15 insertions, 15 deletions
diff --git a/tests/touch/60-seconds.sh b/tests/touch/60-seconds.sh
index 915a1d05d..4f1a818af 100755
--- a/tests/touch/60-seconds.sh
+++ b/tests/touch/60-seconds.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_ touch
echo 60.000000000 > exp || framework_failure_
diff --git a/tests/touch/dangling-symlink.sh b/tests/touch/dangling-symlink.sh
index 1eb2ed38a..8e9235b1b 100755
--- a/tests/touch/dangling-symlink.sh
+++ b/tests/touch/dangling-symlink.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_ touch
rm -f touch-target t-symlink
diff --git a/tests/touch/dir-1.sh b/tests/touch/dir-1.sh
index b4c04fe41..cb0e17275 100755
--- a/tests/touch/dir-1.sh
+++ b/tests/touch/dir-1.sh
@@ -2,7 +2,7 @@
# Make sure touch can operate on a directory.
# This was broken in the 4.0[efg] test releases.
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ touch
touch . || fail=1
diff --git a/tests/touch/empty-file.sh b/tests/touch/empty-file.sh
index a150bd58e..3ab0ee105 100755
--- a/tests/touch/empty-file.sh
+++ b/tests/touch/empty-file.sh
@@ -21,7 +21,7 @@
# fails to work on SunOS 4.1.3 with 'most of the recommended patches' when
# the empty file is on an NFS-mounted 4.2 volume.
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ touch
DEFAULT_SLEEP_SECONDS=2
diff --git a/tests/touch/fail-diag.sh b/tests/touch/fail-diag.sh
index b74d2a5bb..d56dbf32c 100755
--- a/tests/touch/fail-diag.sh
+++ b/tests/touch/fail-diag.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_ touch
skip_if_root_
diff --git a/tests/touch/fifo.sh b/tests/touch/fifo.sh
index 65f4328cc..06a8bc489 100755
--- a/tests/touch/fifo.sh
+++ b/tests/touch/fifo.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_ touch
mkfifo_or_skip_ fifo
diff --git a/tests/touch/no-create-missing.sh b/tests/touch/no-create-missing.sh
index 88a079a01..202a92aaf 100755
--- a/tests/touch/no-create-missing.sh
+++ b/tests/touch/no-create-missing.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_ touch
diff --git a/tests/touch/no-dereference.sh b/tests/touch/no-dereference.sh
index aee9a5cfc..6df02a605 100755
--- a/tests/touch/no-dereference.sh
+++ b/tests/touch/no-dereference.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_ touch
ln -s nowhere dangling || framework_failure_
diff --git a/tests/touch/no-rights.sh b/tests/touch/no-rights.sh
index abebc5261..66631a901 100755
--- a/tests/touch/no-rights.sh
+++ b/tests/touch/no-rights.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_ touch
# Make sure t2 is newer than t1.
diff --git a/tests/touch/not-owner.sh b/tests/touch/not-owner.sh
index 63b8af249..4d3a61bb6 100755
--- a/tests/touch/not-owner.sh
+++ b/tests/touch/not-owner.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_ touch
if env -- test -w /; then
diff --git a/tests/touch/now-owned-by-other.sh b/tests/touch/now-owned-by-other.sh
index 3da8d35ff..3c01fbfa8 100755
--- a/tests/touch/now-owned-by-other.sh
+++ b/tests/touch/now-owned-by-other.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_ touch
require_root_
diff --git a/tests/touch/obsolescent.sh b/tests/touch/obsolescent.sh
index d403127be..925191395 100755
--- a/tests/touch/obsolescent.sh
+++ b/tests/touch/obsolescent.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_ touch
_POSIX2_VERSION=199209; export _POSIX2_VERSION
diff --git a/tests/touch/read-only.sh b/tests/touch/read-only.sh
index ee8c1d3b0..d99d5a417 100755
--- a/tests/touch/read-only.sh
+++ b/tests/touch/read-only.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_ touch
skip_if_root_
diff --git a/tests/touch/relative.sh b/tests/touch/relative.sh
index ba199fce0..2d9d357a3 100755
--- a/tests/touch/relative.sh
+++ b/tests/touch/relative.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_ touch
TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure_
diff --git a/tests/touch/trailing-slash.sh b/tests/touch/trailing-slash.sh
index f09695c07..f8e6b7894 100755
--- a/tests/touch/trailing-slash.sh
+++ b/tests/touch/trailing-slash.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_ touch
ln -s nowhere dangling || framework_failure_
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-06-28 09:50:34 +0000