From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 98F4B3858C74 for ; Thu, 15 Sep 2022 08:50:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98F4B3858C74 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-wr1-x42e.google.com with SMTP id bj14so29684242wrb.12 for ; Thu, 15 Sep 2022 01:50:28 -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; bh=85AabtAffHqQ6NuRJLgPpWU3USyu8CKA/Y4c82I2Um8=; b=cQnbpjJm58GSMRUhSlezsN79yjbp/dudESjM09gQ4vFnmrMQqlU8C9IZnTY1cmQQ1D 06JQN8OEN7QuHqR2YdfP/BE4ousM6G4s/GrBxE1/+sfSi46+HzOJbM2zRFmxgfL/kOMP 2+6vTfG3tHgIPoombTUDpQ2PJhES8D7NChmfsfxeMjyMu4sbu9/61ntcSueGtDFJxoZ7 BDSWu7Q3QoEASgphjMkqtu4Dk4OH+dV43IkyYbjlElDzj/wYsB1DDK3OvTxdmW2D8er3 Bb9feii970dXUEIzFwvYkrwewjpuect6Q36PKKt15NaOgN5w4z2Rhli20sLFlcZIV88/ t+PQ== 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; bh=85AabtAffHqQ6NuRJLgPpWU3USyu8CKA/Y4c82I2Um8=; b=Jxnm/NXJTew39twZE2qjIoQBCH9xVuGJTtX7CgrGV9xcbo10WtBToORDx2CG87GncW POmNbwWVvx6grYlj3l8g+j+hOqb1mllB5/GZAYtXcAtQ1Nl0ZQTnXytOZdog57sh5RDO OC6rM3CCtnVktLBI23V3tP0CFC9DEFx5SvADN6WEV5kU6YYAwf+dvVi7IQPDGFVP8Rm1 CUnpVOJAPC7e/bF+f5oKTOsK9OWuC+E1N2pTV92ef9Nqhhk06w1BOL2MdgBj2Tpy/eF+ +0cj+mYtiDUVCLgvu6dxW2aLiW7286Mn6+gh84h8XQ3kwHeFDcITmmCTMO2LZPspOivZ jyJg== X-Gm-Message-State: ACgBeo17bxzcR23rlsqv+iyEYukbupe9wCW06YEvVVeI7qaOvL16+2pn zAmUJ8Io/omzdi3/5MACPrroRe/8rROtBg== X-Google-Smtp-Source: AA6agR6JRESRYZ8GJ/X4Nsv9gVIu9Uy6qSkB3r0z7yn6zyusGNoBWYFfKjpnXl/0hh+wzKqjlRCNzw== X-Received: by 2002:adf:de01:0:b0:228:62ae:78bc with SMTP id b1-20020adfde01000000b0022862ae78bcmr23095539wrm.41.1663231827325; Thu, 15 Sep 2022 01:50:27 -0700 (PDT) Received: from chigot-Dell.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id s15-20020a05600c384f00b003b4727d199asm1907790wmr.15.2022.09.15.01.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 01:50:27 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH 1/2] ld/testsuite: skip bootstrap.exp when OFILES are missing Date: Thu, 15 Sep 2022 10:50:19 +0200 Message-Id: <20220915085020.413110-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=-11.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: OFILES are normally provided through an environment variable set by Makefiles. However, when launching the testsuite directly through runtest outside the build tree, it can be hard to retrieve them. Thus, they can be missing. Instead of letting tcl raise an error when trying to access this OFILES variable, skip bootstrap.exp if it doesn't exist. ld/ChangeLog: * testsuite/ld-bootstrap/bootstrap.exp: Skip if OFILES is missing --- ld/testsuite/ld-bootstrap/bootstrap.exp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp index f6d38af5d40..52a91fc554e 100644 --- a/ld/testsuite/ld-bootstrap/bootstrap.exp +++ b/ld/testsuite/ld-bootstrap/bootstrap.exp @@ -29,6 +29,12 @@ if ![isnative] { return } +# Skip if OFILES aren't provided, it can happen when lauching +# the testsuites outside the build directory. +if {![info exists OFILES]} { + return +} + # Skip for -fprofile-generate=. catch "exec $nm $plug_opt $OFILES" exec_output send_log "foo: $exec_output" -- 2.25.1