From patchwork Wed Oct 2 18:44:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DJ Delorie X-Patchwork-Id: 34796 Received: (qmail 120550 invoked by alias); 2 Oct 2019 18:44:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 120497 invoked by uid 89); 2 Oct 2019 18:44:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=Forces X-HELO: mx1.redhat.com From: DJ Delorie To: libc-alpha@sourceware.org Subject: Re: [v4, with help] Re: run one test References: <03ae3014-29d5-ccf8-01d0-2f8de525c888@redhat.com> Date: Wed, 02 Oct 2019 14:44:48 -0400 In-Reply-To: (DJ Delorie's message of "Mon, 30 Sep 2019 16:06:55 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Latest iteration... From b8c545e96f32420a1ebab0056e0a4b5dfe19cc1b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 30 Sep 2019 16:04:52 -0400 Subject: Add run-one-test convenience target and makefile help text Adds "make test" for re-running just one test. Also adds "make help" for help with our Makefile targets, and adds a mini-help when you just run "make". Reviewed-by: Carlos O'Donell diff --git a/Makefile b/Makefile index 67ddd01bfe..1f3e088408 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,17 @@ include Makeconfig # This is the default target; it makes everything except the tests. -.PHONY: all -all: lib others +.PHONY: all help minihelp +all: minihelp lib others + +help: + @sed '0,/^help-starts-here$$/d' Makefile.help + +minihelp: + @echo + @echo type \"make help\" for help with common glibc makefile targets + @echo + ifneq ($(AUTOCONF),no) @@ -499,3 +508,12 @@ FORCE: iconvdata/% localedata/% po/%: FORCE $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F) + +# Convenience target to rerun one test, from the top of the build tree +# Example: make test t=wcsmbs/test-wcsnlen +.PHONY: test +test : + @-rm -f $(objpfx)$t.out + $(MAKE) subdir=$(dir $t) -C $(dir $t) ..=../ $(objpfx)$t.out + @cat $(objpfx)$t.test-result + @cat $(objpfx)$t.out diff --git a/Makefile.help b/Makefile.help new file mode 100644 index 0000000000..49815e9b9e --- /dev/null +++ b/Makefile.help @@ -0,0 +1,42 @@ +# Copyright (C) 2019 Free Software Foundation, Inc. +# This file is part of the GNU C Library. + +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with the GNU C Library; if not, see +# . + +This is the file that gets printed when the user runs "make help", +starting just after the "help-starts-here" line. + +help-starts-here + +all + The usual default; builds everything but doesn't run the + tests. + +check (or tests) + Runs the standard set of tests. + +test + Runs one test. Use like this: + make test t=wcsmbs/test-wcsnlen + Note that this will rebuild the test if needed, but will not + rebuild what "make all" would have rebuilt. + +-- +Other useful hints: + +$ rm $(objpfx)testroot.pristine/install.stamp + Forces the testroot to be reinstalled the next time you run + the testsuite (or just rm -rf testroot.pristine) +