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/rmdir | |
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/rmdir')
-rw-r--r-- | tests/rmdir/Makefile.am | 7 | ||||
-rwxr-xr-x | tests/rmdir/fail-perm | 4 | ||||
-rwxr-xr-x | tests/rmdir/ignore | 2 | ||||
-rwxr-xr-x | tests/rmdir/t-slash | 4 |
4 files changed, 5 insertions, 12 deletions
diff --git a/tests/rmdir/Makefile.am b/tests/rmdir/Makefile.am deleted file mode 100644 index 72397f0d9..000000000 --- a/tests/rmdir/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. -TESTS = \ - fail-perm ignore t-slash - -EXTRA_DIST = $(TESTS) - -include $(top_srcdir)/tests/check.mk diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm index 51e4cf7f7..bbfcad838 100755 --- a/tests/rmdir/fail-perm +++ b/tests/rmdir/fail-perm @@ -2,7 +2,7 @@ # For unwritable directory `d', `rmdir -p d d/e/f' would emit # diagnostics but would not fail. Fixed in 5.1.2. -# Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then rmdir --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh mkdir d d/e d/e/f || framework_failure chmod a-w d || framework_failure diff --git a/tests/rmdir/ignore b/tests/rmdir/ignore index 2555613dd..70b294490 100755 --- a/tests/rmdir/ignore +++ b/tests/rmdir/ignore @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then rmdir --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh cwd=`pwd` mkdir -p "$cwd/a/b/c" "$cwd/a/x" || framework_failure diff --git a/tests/rmdir/t-slash b/tests/rmdir/t-slash index 4453f1606..cd4dad34b 100755 --- a/tests/rmdir/t-slash +++ b/tests/rmdir/t-slash @@ -1,7 +1,7 @@ #!/bin/sh # make sure rmdir -p works on a directory specified with a trailing slash -# 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 @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then rmdir --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh mkdir dir || framework_failure |