From patchwork Tue Jul 14 14:21:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 51109 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 852F322A24 for ; Tue, 14 Jul 2015 14:21:28 +0000 (UTC) Received: by wizo10 with SMTP id o10sf5030773wiz.0 for ; Tue, 14 Jul 2015 07:21:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mailing-list:precedence:list-id :list-unsubscribe:list-subscribe:list-archive:list-post:list-help :sender:delivered-to:message-id:date:from:user-agent:mime-version:to :subject:content-type:content-transfer-encoding:x-original-sender :x-original-authentication-results; bh=/FqKLuGGh8OCevXx+CtG2osb8y6dAySmlTpD9T7WAOk=; b=KVvQC6ypG0m2I6U4dzkFNIV6bfNSCKXdbGBj5BhmE0FB5k4rBGbvYIfvA2bvBSO/9f gHpx1RS3qR99c/P/Gk8/thrBFzQRarXcW8sEWV69Hwl2AlC+MR8JIqYxUUGsVPbwhPMh xIaBthOrH8aEk2fylF2O9Hps3K0EDO14uevJPS+gbHggcHYnckM83S6hj9FXVOIz1v/7 DCu2fPcBOsflYHYyMqKCILKiTZjBl0zVPI6FmbGJUOAdPWAeO0+czWzn4yDSuSFn1f+2 AYDo08LZqRjshE821s1IXuaqjweOGYxZC0cc47Xefsv3KmNbYtNElUwI154Sx3Y5RdwK la9g== X-Gm-Message-State: ALoCoQnZuqRaYTgbcvmz+Vu0wX2QHnNcqKj24/gx3/nAa3EYBgBjBBMlV2DlQG0sYSXh8bEKprRv X-Received: by 10.112.98.42 with SMTP id ef10mr13710889lbb.18.1436883687714; Tue, 14 Jul 2015 07:21:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.67 with SMTP id q3ls51284laq.78.gmail; Tue, 14 Jul 2015 07:21:27 -0700 (PDT) X-Received: by 10.112.160.73 with SMTP id xi9mr37517681lbb.92.1436883687572; Tue, 14 Jul 2015 07:21:27 -0700 (PDT) Received: from mail-la0-x232.google.com (mail-la0-x232.google.com. [2a00:1450:4010:c03::232]) by mx.google.com with ESMTPS id l5si1069875lbt.73.2015.07.14.07.21.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 07:21:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::232 as permitted sender) client-ip=2a00:1450:4010:c03::232; Received: by lagx9 with SMTP id x9so7036947lag.1 for ; Tue, 14 Jul 2015 07:21:27 -0700 (PDT) X-Received: by 10.112.125.34 with SMTP id mn2mr8208303lbb.76.1436883687437; Tue, 14 Jul 2015 07:21:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2422004lbb; Tue, 14 Jul 2015 07:21:26 -0700 (PDT) X-Received: by 10.66.161.135 with SMTP id xs7mr82196003pab.154.1436883685612; Tue, 14 Jul 2015 07:21:25 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id w13si2011557pbt.178.2015.07.14.07.21.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 07:21:25 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-60927-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 93666 invoked by alias); 14 Jul 2015 14:21:17 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 93655 invoked by uid 89); 14 Jul 2015 14:21:16 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-yk0-f172.google.com X-Received: by 10.13.198.2 with SMTP id i2mr45065922ywd.123.1436883670518; Tue, 14 Jul 2015 07:21:10 -0700 (PDT) Message-ID: <55A51AD3.4000802@linaro.org> Date: Tue, 14 Jul 2015 11:21:07 -0300 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: GNU C Library Subject: [COMMITTED] [PATCH] Avoid C++ tests when the C++ cannot be linked X-Original-Sender: adhemerval.zanella@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::232 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 * elf/Makefile [ifeq (yes,$(build-shared)) (tests)] (tst-nodelete): Add iff $CXX is set. [ifeq (yes,$(build-shared)) (modules-names)] (tst-nodelete-rtldmod): Likewise. (tst-nodelete-zmodiff): Likewise. * nptl/Makefile [[ifeq (,$(CXX))] (tests-unsupported)]: Add tst-once5. diff --git a/elf/Makefile b/elf/Makefile index 535421f..90d5058 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -132,7 +132,7 @@ tests += $(tests-static) ifeq (yes,$(build-shared)) tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ constload1 order noload filter unload \ - reldep reldep2 reldep3 reldep4 nodelete nodelete2 tst-nodelete \ + reldep reldep2 reldep3 reldep4 nodelete nodelete2 \ nodlopen nodlopen2 neededtest neededtest2 \ neededtest3 neededtest4 unload2 lateglobal initfirst global \ restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \ @@ -145,7 +145,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ tst-audit1 tst-audit2 tst-audit8 tst-audit9 \ tst-stackguard1 tst-addr1 tst-thrlock \ - tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4) \ + tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4 \ + tst-nodelete) \ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ tst-ptrguard1 tst-tlsalign tst-tlsalign-extern # reldep9 @@ -208,8 +209,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-unique2mod1 tst-unique2mod2 \ tst-auditmod9a tst-auditmod9b \ $(if $(CXX),tst-unique3lib tst-unique3lib2 tst-unique4lib \ - tst-nodelete-uniquemod) \ - tst-nodelete-rtldmod tst-nodelete-zmod \ + tst-nodelete-uniquemod tst-nodelete-rtldmod \ + tst-nodelete-zmod) \ tst-initordera1 tst-initorderb1 \ tst-initordera2 tst-initorderb2 \ tst-initordera3 tst-initordera4 \ diff --git a/nptl/Makefile b/nptl/Makefile index 5bc4ad1..140f063 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -400,7 +400,7 @@ endif ifeq (,$(CXX)) # These tests require a C++ compiler and runtime. -tests-unsupported += tst-cancel24 tst-cancel24-static +tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5 endif include ../Rules