coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] maint: remove now-superfluous coreutils-path-check rule


From: Jim Meyering
Subject: [PATCH] maint: remove now-superfluous coreutils-path-check rule
Date: Tue, 20 Mar 2012 18:36:10 +0100

This coreutils-specific part of "make distcheck" is unnecessary, these days...

>From cbedb8aa213a12310465131a8925c71f4cc8431d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 17 Mar 2012 12:06:56 +0100
Subject: [PATCH] maint: remove now-superfluous coreutils-path-check rule

* dist-check.mk (coreutils-path-check): Now that we set PATH in
TESTS_ENVIRONMENT, it seems like overkill to make "distcheck"
rerun all tests just to check this.
(my-distcheck): Remove sole use.
---
 dist-check.mk |   38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/dist-check.mk b/dist-check.mk
index dd30db2..6706ea0 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -96,43 +96,6 @@ define my-instcheck
     }
 endef

-# The hard-linking for-loop below ensures that there is a bin/ directory
-# full of all of the programs under test (except the ones 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.
-define coreutils-path-check
-  {                                                    \
-    echo running coreutils-path-check;                 \
-    if test -f $(srcdir)/src/true.c; then              \
-      fail=1;                                          \
-      mkdir $(bin)                                     \
-       && ($(write_loser)) > $(bin)/loser              \
-       && chmod a+x $(bin)/loser                       \
-       && for i in $(built_programs); do               \
-              case $$i in                              \
-                rm|expr|basename|echo|sort|ls|tr);;    \
-                cat|dirname|mv|wc);;                   \
-                *) ln $(bin)/loser $(bin)/$$i;;        \
-              esac;                                    \
-            done                                       \
-         && ln -sf ../src/true $(bin)/false            \
-         && PATH=`pwd`/$(bin)$(PATH_SEPARATOR)$$PATH   \
-               $(MAKE) -C tests check                  \
-         && { test -d gnulib-tests                     \
-                && $(MAKE) -C gnulib-tests check       \
-                || :; }                                \
-         && rm -rf $(bin)                              \
-         && fail=0;                                    \
-    else                                               \
-      fail=0;                                          \
-    fi;                                                        \
-    test $$fail = 1 && exit 1 || :;                    \
-  }
-endef
-
 # Use this to make sure we don't run these programs when building
 # from a virgin compressed tarball file, below.
 null_AM_MAKEFLAGS ?= \
@@ -156,7 +119,6 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
          $(MAKE) dvi;                                  \
          $(install-transform-check);                   \
          $(my-instcheck);                              \
-         $(coreutils-path-check);                      \
          $(MAKE) distclean                             \
        )
        (cd $(t) && mv $(distdir) $(distdir).old        \
--
1.7.10.rc1.23.g16a10



reply via email to

[Prev in Thread] Current Thread [Next in Thread]