summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2007-10-20 14:41:50 +0200
committerJim Meyering <meyering@redhat.com>2007-10-21 14:01:15 +0200
commit60a5ad4b94535bdf4287d9e6892b8fe597484d00 (patch)
treef4a229c7427e73b0ed5764321e2f93ff5eb992a8
parenta34bea4976bae29b1519bc2852fb87f64a1295cf (diff)
downloadcoreutils-60a5ad4b94535bdf4287d9e6892b8fe597484d00.tar.xz
Put always-failing programs first in PATH, so tests cannot mistakenly run installed versions.
* Makefile.maint (my-distcheck): Set up a bogus bin/ dir, to be used for "make check". Signed-off-by: Jim Meyering <meyering@redhat.com>
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.maint21
2 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf4a0add9..ab0562967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-10-20 Jim Meyering <meyering@redhat.com>
+ Put always-failing programs first in PATH, so tests cannot mistakenly
+ run installed versions.
+ * Makefile.maint (my-distcheck): Set up a bogus bin/ dir, to be used
+ for "make check".
+
* doc/coreutils.texi (tee invocation): Fix typo. Add a little.
Add a cross-reference to bashref's Process Substitution node.
diff --git a/Makefile.maint b/Makefile.maint
index 65e944dd1..ba39dec1b 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -562,13 +562,23 @@ null_AM_MAKEFLAGS = \
AUTOHEADER=false \
MAKEINFO=false
+built_programs = $$(cd src && MAKEFLAGS= $(MAKE) -s built_programs.list)
+
warn_cflags = -Dlint -O -Werror -Wall -Wformat -Wshadow -Wpointer-arith
+bin=bin-$$$$
# Use -Wformat -Werror to detect format-string/arg-list mismatches.
# Also, check for shadowing problems with -Wshadow, and for pointer
# arithmetic problems with -Wpointer-arith.
# These CFLAGS are pretty strict. If you build this target, you probably
# have to have a recent version of gcc and glibc headers.
+# The for-loop below ensures that there is a bin/ directory full of all
+# of the programs under test (except the few that are required for basic
+# Makefile rules), all symlinked to the just-built "false" program.
+# This is to ensure that if ever a test neglects to make PATH include
+# the build srcdir, these always-failing programs will run.
+# Otherwise, it is too easy to test the wrong programs.
+# Note that "false" itself is a symlink to true, so it too will malfunction.
TMPDIR ?= /tmp
t=$(TMPDIR)/$(PACKAGE)/test
my-distcheck: $(local-check) $(release_archive_dir)/$(prev-tgz)
@@ -580,7 +590,16 @@ my-distcheck: $(local-check) $(release_archive_dir)/$(prev-tgz)
&& $(MAKE) CFLAGS='$(warn_cflags)' \
AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
&& $(MAKE) dvi \
- && $(MAKE) check \
+ && mkdir $(bin) \
+ && for i in $(built_programs); do \
+ case $$i in \
+ rm|expr|basename|echo|sort|ls|tr);; \
+ *) ln -s ../src/false $(bin)/$$i;; \
+ esac; \
+ done \
+ && ln -sf ../src/true $(bin)/false \
+ && PATH=`pwd`/$(bin):$$PATH $(MAKE) check \
+ && rm -rf $(bin) \
&& $(MAKE) distclean
(cd $(t) && mv $(distdir) $(distdir).old \
&& $(AMTAR) -zxf - ) < $(distdir).tar.gz