[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] maint.mk: remove coreutils-specific rules and variables
From: |
Jim Meyering |
Subject: |
[PATCH] maint.mk: remove coreutils-specific rules and variables |
Date: |
Fri, 24 Apr 2009 21:40:44 +0200 |
I've gone ahead and move all of the my-distcheck-related
rules and variables back into coreutils.
I'm pretty sure no one was using them.
They really were too coreutils-specific to be in this file,
now that it's officially shared.
>From f937d166906633801966f9cf3e0efe6767ed586f Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 24 Apr 2009 20:45:37 +0200
Subject: [PATCH] maint.mk: remove coreutils-specific rules and variables
* top/maint.mk (bin, taint-distcheck, coreutils-path-check, t): Remove.
(fake_home, install-transform-check, my-instcheck, pfx, TMPDIR): Remove.
(t_prefix, t_taint, tp, warn_cflags, write_loser, my-distcheck): Remove.
---
ChangeLog | 5 ++
top/maint.mk | 134 ----------------------------------------------------------
2 files changed, 5 insertions(+), 134 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1dc1009..94d42bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-04-24 Jim Meyering <address@hidden>
+ maint.mk: remove coreutils-specific rules and variables
+ * top/maint.mk (bin, taint-distcheck, coreutils-path-check, t): Remove.
+ (fake_home, install-transform-check, my-instcheck, pfx, TMPDIR): Remove.
+ (t_prefix, t_taint, tp, warn_cflags, write_loser, my-distcheck): Remove.
+
maint.mk: remove obsolete rule
* top/maint.mk (rel-check): Remove rule.
(WGET, WGETFLAGS): Remove now-unused variables.
diff --git a/top/maint.mk b/top/maint.mk
index 4e4c050..fc72d11 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -628,140 +628,6 @@ null_AM_MAKEFLAGS = \
built_programs = $$(cd src && MAKEFLAGS= $(MAKE) -s built_programs.list)
-warn_cflags = -Dlint -O -Werror -Wall -Wformat -Wshadow -Wpointer-arith
-bin=bin-$$$$
-
-write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'
-
-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
-pfx=$(t)/i
-
-# More than once, tainted build and source directory names would
-# have caused at least one "make check" test to apply "chmod 700"
-# to all directories under $HOME. Make sure it doesn't happen again.
-tp := $(shell echo "$(TMPDIR)/$(PACKAGE)-$$$$")
-t_prefix = $(tp)/a
-t_taint = '$(t_prefix) b'
-fake_home = $(tp)/home
-
-# Ensure that tests run from tainted build and src dir names work,
-# and don't affect anything in $HOME. Create witness files in $HOME,
-# record their attributes, and build/test. Then ensure that the
-# witnesses were not affected.
-ALL_RECURSIVE_TARGETS += taint-distcheck
-taint-distcheck: $(DIST_ARCHIVES)
- test -d $(t_taint) && chmod -R 700 $(t_taint) || :
- -rm -rf $(t_taint) $(fake_home)
- mkdir -p $(t_prefix) $(t_taint) $(fake_home)
- GZIP=$(GZIP_ENV) $(AMTAR) -C $(t_taint) -zxf $(distdir).tar.gz
- mkfifo $(fake_home)/fifo
- touch $(fake_home)/f
- mkdir -p $(fake_home)/d/e
- ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
- cd $(t_taint)/$(distdir) \
- && ./configure \
- && $(MAKE) \
- && HOME=$(fake_home) $(MAKE) check \
- && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
- && diff $(tp)/.ls-before $(tp)/.ls-after \
- && test -d $(t_prefix)
- rm -rf $(tp)
-
-# Verify that a twisted use of --program-transform-name=PROGRAM works.
-define install-transform-check
- echo running install-transform-check \
- && rm -rf $(pfx) \
- && $(MAKE) program_transform_name='s/.*/zyx/' \
- prefix=$(pfx) install \
- && test "$$(echo $(pfx)/bin/*)" = "$(pfx)/bin/zyx" \
- && test "$$(find $(pfx)/share/man -type f|sed 's,.*/,,;s,\..*,,')" = "zyx"
-endef
-
-# Install, then verify that all binaries and man pages are in place.
-# Note that neither the binary, ginstall, nor the ].1 man page is installed.
-define my-instcheck
- $(MAKE) prefix=$(pfx) install \
- && test ! -f $(pfx)/bin/ginstall \
- && { fail=0; \
- for i in $(built_programs); do \
- test "$$i" = ginstall && i=install; \
- for j in "$(pfx)/bin/$$i" \
- "$(pfx)/share/man/man1/$$i.1"; do \
- case $$j in *'[.1') continue;; esac; \
- test -f "$$j" && : \
- || { echo "$$j not installed"; fail=1; }; \
- done; \
- done; \
- test $$fail = 1 && exit 1 || :; \
- }
-endef
-
-define 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 -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 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.
-ALL_RECURSIVE_TARGETS += my-distcheck
-my-distcheck: $(DIST_ARCHIVES) $(local-check)
- $(MAKE) syntax-check
- $(MAKE) check
- -rm -rf $(t)
- mkdir -p $(t)
- GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
- cd $(t)/$(distdir) \
- && ./configure --disable-nls \
- && $(MAKE) CFLAGS='$(warn_cflags)' \
- AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
- && $(MAKE) dvi \
- && $(install-transform-check) \
- && $(my-instcheck) \
- && $(coreutils-path-check) \
- && $(MAKE) distclean
- (cd $(t) && mv $(distdir) $(distdir).old \
- && $(AMTAR) -zxf - ) < $(distdir).tar.gz
- diff -ur $(t)/$(distdir).old $(t)/$(distdir)
- -rm -rf $(t)
- @echo "========================"; \
- echo "$(distdir).tar.gz is ready for distribution"; \
- echo "========================"
-
rel-files = $(DIST_ARCHIVES)
gnulib-version = $$(cd $(gnulib_dir) && git describe)
--
1.6.3.rc1.223.g2f326
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] maint.mk: remove coreutils-specific rules and variables,
Jim Meyering <=