From patchwork Sun Jan 1 09:21:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 709988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3trvq52dTpz9s2G for ; Sun, 1 Jan 2017 20:21:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="NMRNwKca"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= AEF9fXGONdG7ad0XtRXNJk9Q6f07Y+Oio/PviN0Orc19q2+xnJN6oOWGvR9qRgyF 3ejmaefIF0wEC9xjMooWZKum6a0vL8L0izorkgfwHzQ/BHlzfPHYWlY4turcXsER BEuoJfY7imxkSqOB7RoF+pMx25qQGGPQNRjT5Ymj4FM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=JvH+rQ b3Mavbu5BONsrI12mp0s8=; b=NMRNwKcaytsC4qYp+MSRPh7VmYu1x0z4/dWgT1 mYcq+lHzQWT9KePOQDQ0uk/4/LLZTBeYI+RGqQdQ2+ix5sCvI82oW8W+CEFyJiTz lN5D2vIuYFsTSCkzrrlTEICu5dqbSvwTAHrdi/qBG0LZunFqutO3wlBeaygHW2wb 34gnI= Received: (qmail 88447 invoked by alias); 1 Jan 2017 09:21:44 -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 88420 invoked by uid 89); 1 Jan 2017 09:21:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=BAYES_50, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=testsrcs, test-srcs, have-tunables, havetunables X-HELO: mx1.redhat.com Date: Sun, 01 Jan 2017 10:21:39 +0100 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] malloc: Run tunables tests only if tunables are enabled User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170101092139.8B2204048EEF4@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) Otherwise, the environment variable will not have any effect and the test will fail. 2017-01-01 Florian Weimer * malloc/Makefile (tests): Add tst-malloc-usable-tunables for have-tunables only. (tests-static): Add tst-malloc-usable-static-tunables for have-tunables only. diff --git a/malloc/Makefile b/malloc/Makefile index bbe5083..e93b83b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -33,13 +33,16 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \ tst-mallocfork2 \ tst-interpose-nothread \ tst-interpose-thread \ - tst-malloc-usable-tunables tests-static := \ tst-interpose-static-nothread \ tst-interpose-static-thread \ tst-malloc-usable-static \ - tst-malloc-usable-static-tunables + +ifneq (no,$(have-tunables)) +tests += tst-malloc-usable-tunables +tests-static += tst-malloc-usable-static-tunables +endif tests += $(tests-static) test-srcs = tst-mtrace