From patchwork Mon Dec 19 11:15:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nix X-Patchwork-Id: 18568 Received: (qmail 126348 invoked by alias); 19 Dec 2016 11:26:22 -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 126077 invoked by uid 89); 19 Dec 2016 11:26:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=7910 X-HELO: mail.esperi.org.uk From: Nix To: libc-alpha@sourceware.org Cc: fweimer@redhat.com Subject: [PATCH 13/15] Move all tests out of csu. Date: Mon, 19 Dec 2016 11:15:26 +0000 Message-Id: <20161219111528.14969-14-nix@esperi.org.uk> In-Reply-To: <20161219111528.14969-1-nix@esperi.org.uk> References: <20161219111528.14969-1-nix@esperi.org.uk> X-DCC--Metrics: spindle 1480; Body=2 Fuz1=2 Fuz2=2 From: Nick Alcock Stack-protection on .o files in csu/ must be suppressed for the sake of library startup code. This also suppresses stack-protection in tests (which are also covered by CFLAGS-.o), though this is neither necessary nor desirable. So impose the rule that .o files in csu/ are necessarily C startup code, and move the few tests in there into misc/ instead. v10: New. * csu/Makefile (tests): Move this... (tests-static): ... and this... * misc/Makefile (tests): ... to here... (tests-static): ... and here. * csu/tst-empty.c: Move to... * misc/tst-empty.c: ... here. * csu/tst-atomic.c: Move to... * misc/tst-atomic.c: ... here. * csu/tst-atomic-long.c: Move to... * misc/tst-atomic-long.c: ... here. --- csu/Makefile | 3 --- misc/Makefile | 5 ++++- {csu => misc}/tst-atomic-long.c | 0 {csu => misc}/tst-atomic.c | 0 {csu => misc}/tst-empty.c | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {csu => misc}/tst-atomic-long.c (100%) rename {csu => misc}/tst-atomic.c (100%) rename {csu => misc}/tst-empty.c (100%) diff --git a/csu/Makefile b/csu/Makefile index 22afe67..8e33cb1 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -42,9 +42,6 @@ install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies) generated += version-info.h before-compile += $(objpfx)version-info.h -tests := tst-empty tst-atomic tst-atomic-long -tests-static := tst-empty - CFLAGS-.o += $(no-stack-protector) CFLAGS-.og += $(no-stack-protector) CFLAGS-.op += $(no-stack-protector) diff --git a/misc/Makefile b/misc/Makefile index c382f92..a390872 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -79,7 +79,10 @@ gpl2lgpl := error.c error.h tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ - tst-preadvwritev tst-preadvwritev64 tst-makedev + tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \ + tst-atomic tst-atomic-long +tests-static := tst-empty + ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-error1-mem.out endif diff --git a/csu/tst-atomic-long.c b/misc/tst-atomic-long.c similarity index 100% rename from csu/tst-atomic-long.c rename to misc/tst-atomic-long.c diff --git a/csu/tst-atomic.c b/misc/tst-atomic.c similarity index 100% rename from csu/tst-atomic.c rename to misc/tst-atomic.c diff --git a/csu/tst-empty.c b/misc/tst-empty.c similarity index 100% rename from csu/tst-empty.c rename to misc/tst-empty.c