From 512e111a926fedbd7dc7b0875ab837dbb7d2a7a6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 17 Apr 2008 23:34:45 +0200 Subject: 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. --- tests/readlink/Makefile.am | 7 ------- tests/readlink/can-e | 4 ++-- tests/readlink/can-f | 4 ++-- tests/readlink/can-m | 4 ++-- tests/readlink/rl-1 | 4 ++-- 5 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 tests/readlink/Makefile.am (limited to 'tests/readlink') diff --git a/tests/readlink/Makefile.am b/tests/readlink/Makefile.am deleted file mode 100644 index 54a975896..000000000 --- a/tests/readlink/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. -TESTS = \ - rl-1 can-e can-f can-m - -EXTRA_DIST = $(TESTS) - -include $(top_srcdir)/tests/check.mk diff --git a/tests/readlink/can-e b/tests/readlink/can-e index 1758d4ed4..500bbc582 100755 --- a/tests/readlink/can-e +++ b/tests/readlink/can-e @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize-existing mode (readlink -e). -# 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 @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then readlink --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh pwd=`pwd` my_pwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/readlink/can-f b/tests/readlink/can-f index c920ddd36..3ddfb8dbc 100755 --- a/tests/readlink/can-f +++ b/tests/readlink/can-f @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize mode (readlink -f). -# 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 @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then readlink --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh pwd=`pwd` my_pwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/readlink/can-m b/tests/readlink/can-m index bc5bafec3..e6a3e7589 100755 --- a/tests/readlink/can-m +++ b/tests/readlink/can-m @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize-missing mode (readlink -m). -# 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 @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then readlink --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh pwd=`pwd` my_pwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1 index 0b1b21819..c2fbcd4d5 100755 --- a/tests/readlink/rl-1 +++ b/tests/readlink/rl-1 @@ -1,7 +1,7 @@ #!/bin/sh # test for readlink mode. -# 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 @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then readlink --version fi -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh mkdir subdir || framework_failure touch regfile || framework_failure -- cgit v1.2.3-70-g09d2