summaryrefslogtreecommitdiff
path: root/tests/ln
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-04-17 23:34:45 +0200
committerJim Meyering <meyering@redhat.com>2008-04-21 00:01:51 +0200
commit512e111a926fedbd7dc7b0875ab837dbb7d2a7a6 (patch)
treef77cdb2c6bfc71f0560cf073324365c0a3e65526 /tests/ln
parentd25bf9dceb90dcb91f8af57aff433273c7145ff7 (diff)
downloadcoreutils-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/ln')
-rw-r--r--tests/ln/Makefile.am7
-rwxr-xr-xtests/ln/backup-14
-rwxr-xr-xtests/ln/hard-backup6
-rwxr-xr-xtests/ln/misc4
-rwxr-xr-xtests/ln/sf-14
-rwxr-xr-xtests/ln/target-14
6 files changed, 11 insertions, 18 deletions
diff --git a/tests/ln/Makefile.am b/tests/ln/Makefile.am
deleted file mode 100644
index 8fe7b4725..000000000
--- a/tests/ln/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-TESTS = \
- hard-backup target-1 sf-1 misc backup-1
-
-EXTRA_DIST = $(TESTS)
-
-include $(top_srcdir)/tests/check.mk
diff --git a/tests/ln/backup-1 b/tests/ln/backup-1
index 05041fe21..b1d1bb105 100755
--- a/tests/ln/backup-1
+++ b/tests/ln/backup-1
@@ -2,7 +2,7 @@
# Try to create a symlink with backup where the destination file exists
# and the backup file name is a hard link to the destination file.
-# Copyright (C) 1999, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2007-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
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $srcdir/../test-lib.sh
+. $top_srcdir/tests/test-lib.sh
touch a b || framework_failure
diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup
index 72178a6b2..d46316ff9 100755
--- a/tests/ln/hard-backup
+++ b/tests/ln/hard-backup
@@ -1,7 +1,7 @@
#!/bin/sh
# Ensure that 'ln --backup F F' gives a proper diagnostic.
-# Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-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
ln --version
fi
-. $srcdir/../lang-default
-. $srcdir/../test-lib.sh
+. $top_srcdir/tests/lang-default
+. $top_srcdir/tests/test-lib.sh
touch f || framework_failure
diff --git a/tests/ln/misc b/tests/ln/misc
index be7efb036..1f3c1d16e 100755
--- a/tests/ln/misc
+++ b/tests/ln/misc
@@ -1,7 +1,7 @@
#!/bin/sh
# Miscellaneous tests for "ln".
-# Copyright (C) 1998-2000, 2004, 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 1998-2000, 2004, 2006-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
ln --version
fi
-. $srcdir/../test-lib.sh
+. $top_srcdir/tests/test-lib.sh
t=tln-symlink
d=tln-subdir
diff --git a/tests/ln/sf-1 b/tests/ln/sf-1
index 4d6989382..9ac0f9873 100755
--- a/tests/ln/sf-1
+++ b/tests/ln/sf-1
@@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then
fi
# Make sure we get English translations.
-. $srcdir/../lang-default
-. $srcdir/../test-lib.sh
+. $top_srcdir/tests/lang-default
+. $top_srcdir/tests/test-lib.sh
echo foo > a || framework_failure
ln -s . b || framework_failure
diff --git a/tests/ln/target-1 b/tests/ln/target-1
index e42094057..6a49b2f4d 100755
--- a/tests/ln/target-1
+++ b/tests/ln/target-1
@@ -1,7 +1,7 @@
#!/bin/sh
# Test "ln --target-dir" with one file.
-# Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006-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
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $srcdir/../test-lib.sh
+. $top_srcdir/tests/test-lib.sh
mkdir d || framework_failure
fail=0