From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 73581385840D for ; Fri, 4 Nov 2022 16:33:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 73581385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x336.google.com with SMTP id i5-20020a1c3b05000000b003cf47dcd316so5746346wma.4 for ; Fri, 04 Nov 2022 09:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BR9rxcz4Pjzi7Jeo5vhUl/WZeceO49176wEiKkz7G0o=; b=LTTgVVVbLsDzmA/K7hBunP5bMlTHrYYVwJ0txHbx2RbSa6qfEYk4jwplUQrP3bkv2v 3wbHklvByWRZ8aO0Ww4kkRmWyY9fMhKj/Haj4svXlH+Ov/WxGPDoP/Sg/Q6kmffDWw01 pmphV9PLIBxNS0ITcrHAkTz2kW9c2he3tDRPaedHTUs8pbX4Hc/4UgldhfFJePHiLo/O xdnwBRa+ZpLSFlSv6iKlF+c8ZJoeuHVXkTVhJat2dU78eOpjcrWTMH5eMe5YJIZjhtda Ip91JdfP/0fhLaUaDTtbtVd1+o2gZ8MqMlj7t3TCwKgrtTYQ34ZL+2jYucMTbEaC1bl0 N4jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BR9rxcz4Pjzi7Jeo5vhUl/WZeceO49176wEiKkz7G0o=; b=COV/DivxKvYIF1bGCdjURwBCd3AOB2WkV4KklBGj6KoIEumpQXPys99W0NCkr0eOsR 9j1KtVnHJuCKhpLl1CO5FenrzLNvyHdNFJePJ1vNdifOIDTwnina7cDyUC7Rlfj3JFCd VYcH2LVh7zr2OeeMwI0LUTyDG7p0bLzGzbL5zpcYmqRGfCcWLXMwjs3XpxdamgshyLZV AhT6XBJ3AR0BWH4AD8ODzMe6BcxWHdj4QMOWZNyRgOfj532C428UYTsneKQg2CK6sb1b 2juZ0ugwGW26TGJHAaHdy0qJNXjNQPUwbUX0/9fHne/phJPRKEXhCc8Wm4L/RCIOEbjd PnSg== X-Gm-Message-State: ACrzQf1uHlpEJSOqVR7YsblnI2Y/E71IZEsba7nZMjdPd+qh6XE/egtz qHfIbtXlLVWxdFhqwSTXUus6nDGM8B9Mjw== X-Google-Smtp-Source: AMsMyM5pHz+eiy14Ao+Kq1ssGP5xg8if8wxpPFkhXOL5+ZDsa5OkwJdgsebLjQs9ygZbrS1I436akA== X-Received: by 2002:a7b:c303:0:b0:3b4:6e89:e5d5 with SMTP id k3-20020a7bc303000000b003b46e89e5d5mr24783158wmj.111.1667579613081; Fri, 04 Nov 2022 09:33:33 -0700 (PDT) Received: from chigot-Dell.home ([2a01:cb15:8123:8100:ac2d:4a3a:f207:258b]) by smtp.gmail.com with ESMTPSA id x14-20020adfffce000000b002366eb01e07sm3647477wrs.114.2022.11.04.09.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 09:33:32 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH] ld/testsuite: skip tests related to -shared when disabled Date: Fri, 4 Nov 2022 17:33:28 +0100 Message-Id: <20221104163328.2274371-1-chigot@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: I didn't remove the hardcoded switch below as I'm not sure if some platforms still want to skip these tests even if the shared support is there. --- Call the helper function "check_shared_lib_support" to ensure -shared is enabled before launching ld-shared, ld-elfweak and ld-elfvers. This allows to catch custom targets explicitly disabling it. ld/ChangeLog: * testsuite/ld-elfvers/vers.exp: Call check_shared_lib_support. * testsuite/ld-elfweak/elfweak.exp: Likewise. * testsuite/ld-shared/shared.exp: Likewise. --- ld/testsuite/ld-elfvers/vers.exp | 5 +++++ ld/testsuite/ld-elfweak/elfweak.exp | 5 +++++ ld/testsuite/ld-shared/shared.exp | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp index 3e2ba2aac07..2e44d4a410f 100644 --- a/ld/testsuite/ld-elfvers/vers.exp +++ b/ld/testsuite/ld-elfvers/vers.exp @@ -27,6 +27,11 @@ if { ![check_compiler_available] } { return } +# Skip targets where -shared is not supported +if { ![check_shared_lib_support] } { + return +} + # This test can only be run on a couple of ELF platforms. # Square bracket expressions seem to confuse istarget. # This is similar to the test that is used in ld-shared, BTW. diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp index 99188654df1..69826803a17 100644 --- a/ld/testsuite/ld-elfweak/elfweak.exp +++ b/ld/testsuite/ld-elfweak/elfweak.exp @@ -27,6 +27,11 @@ if { ![check_compiler_available] } { return } +# Skip targets where -shared is not supported +if { ![check_shared_lib_support] } { + return +} + # This test can only be run on a couple of ELF platforms. # Square bracket expressions seem to confuse istarget. # This is similar to the test that is used in ld-shared, BTW. diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp index 229fddbd436..94e03fceff9 100644 --- a/ld/testsuite/ld-shared/shared.exp +++ b/ld/testsuite/ld-shared/shared.exp @@ -30,6 +30,11 @@ if { ![check_compiler_available] } { return } +# Skip targets where -shared is not supported +if { ![check_shared_lib_support] } { + return +} + # This test can only be run on a couple of ELF platforms. # Square bracket expressions seem to confuse istarget. if { ![istarget hppa*64*-*-hpux*] \ -- 2.25.1