From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 5216C3858D37 for ; Sat, 16 Mar 2024 16:42:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5216C3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5216C3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710607368; cv=none; b=iEFJWMhViZnjFVxHbFiFm0R8XbYNjLnJH9qlToqVKcXNehdiwl8/EJnVC4doH89hF2c9kZUNKml92IbTjNIr/3p4vNVeAbqGCQklx86rnjokvzorDwJkmNjKsRA6nt7K1V61njFLZybXdun7q/6Aj0d3BMvr8Aw/keHZz7WRrc0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710607368; c=relaxed/simple; bh=7QVN4WbBHS/E7p5GJdYw7vOjfIc4J87qVqTlf98iJmA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=MmNxI+aClEbcSnz4mvJPXTq4atOLLYlAKATH43x9mkBSD6OdEfhmeVKDyCmue8OK+bOazoQLpggozINY2+W8ZctaXqV/MqbWS/A7FcfRveDBdQAOCmX/O9rNKPdfNOugMN/bCrpblVHnVvf14p1CfMqiw8a3mUiv7hzsbjzJSUM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6e6b6e000a4so2257342b3a.0 for ; Sat, 16 Mar 2024 09:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710607365; x=1711212165; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=deTipRrtZJfwxTh+FwotfVxd+sPbBn+dfrpcEiIOmOU=; b=LrNXm52KejD7XzVhtZWhYLWzGqbFzcA/yNTJcPygIekDBKr7LH30szc7pynAT3AzSD L+MAH/bJ+jLLq2oQMReGXS3SCu1ny4oFi/V03j82BE7K48UxHcZ4TgpqxpI9p+f4KMvc +AHBO1awgw5z/u9lphH3B6kjLOfeiDyULqMs9OANA+x/6F9DH0gXA+YEjJcREojZpEcO igpBQc29lkSKi6xI1ViZW1Ifsy1vk0owgH3kLBZP15h6AR7U07iHdKj5W1voOoAkMdfX 49YlGHtUma3dqLrY+m4JFdICf5dZEKy6JASdBvrl78TzKEo2RGybI3Q6qfQ8tAiYZzT7 Wcnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710607365; x=1711212165; 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=deTipRrtZJfwxTh+FwotfVxd+sPbBn+dfrpcEiIOmOU=; b=UjyTXBq75RK/D5J0HGj+m45ppW1JvzAr1AVRT1vn7CVPg3l8VbNA9eFwH92G0o6w6v HJ/rJsqQ6hoTR3zYhZqoidYZYdSymFPbJ+l22bvA0y2zI3y9DkzNmK1AcQ1Znhx3WCw5 rWvplztUJOsUDMmJu+fTeYhet5DGrmuMrfzuk9PQKWdhSEwMXsnRfqG1thPFCfYOyVE3 BIGQHwAN2TQP7ue3zLGlOC0Za0F/q07/KOInljbAzvlnYQeKUj9QKV35hs/8wpfA493J +sSyx2jzu8q21wI7PW2PxE21lFqqlsfjbxhUVp2p8cO39Y2EELcOhqKNc+WKAw+ypI10 3RYw== X-Gm-Message-State: AOJu0YyJsdHNnm/Gckqh6fLoUz6XsYu00r8qO6TJXQwpHBSwS+ohNy4j mR2F9x3P4uyDwmr8mNPEdCdK+8KizSL7LqabD+UpEcedZFunCt6M3oUm1HQW X-Google-Smtp-Source: AGHT+IGCkTVguiq9MBNS5QQyb++uLTZQwRzCDDrd6J5WoczjGvE9JqAdcbu2J2KBCsRm2gp+OMHriw== X-Received: by 2002:a05:6a20:548c:b0:1a3:3e17:6055 with SMTP id i12-20020a056a20548c00b001a33e176055mr11201706pzk.28.1710607365127; Sat, 16 Mar 2024 09:42:45 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id b18-20020a630c12000000b005dca5caed40sm4271959pgl.81.2024.03.16.09.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 09:42:44 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 9F5CB74005D; Sat, 16 Mar 2024 09:42:43 -0700 (PDT) From: "H.J. Lu" To: binutils@sourceware.org Cc: schwab@linux-m68k.org Subject: [PATCH v3] ld: Support LD_UNDER_TEST environment variable Date: Sat, 16 Mar 2024 09:42:43 -0700 Message-ID: <20240316164243.410885-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3019.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_ABUSEAT,RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: Support LD_UNDER_TEST environment variable to test a different linker. Issue an error if LD_UNDER_TEST isn't an absolute full path. * testsuite/config/default.exp: If LD_UNDER_TEST environment variable exists, set ld and LD to it and set up tmpdir/ld/ld. Issue an error if LD_UNDER_TEST isn't an absolute full path. --- ld/testsuite/config/default.exp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp index 705543054c2..0ce81e13784 100644 --- a/ld/testsuite/config/default.exp +++ b/ld/testsuite/config/default.exp @@ -21,6 +21,18 @@ # Written by Jeffrey Wheat (cassidy@cygnus.com) # +if [info exists env(LD_UNDER_TEST)] { + # LD_UNDER_TEST must be an absolute full path. + if {[file pathtype $env(LD_UNDER_TEST)] ne "absolute"} { + perror "**************************************************" + perror "$env(LD_UNDER_TEST) isn't an absolute full path." + perror "**************************************************" + exit 1 + } + set ld "$env(LD_UNDER_TEST)" + set LD "$ld" +} + if ![info exists ld] then { set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] } @@ -64,9 +76,16 @@ remote_exec host "mkdir -p tmpdir" if {[info exists ld_testsuite_bindir]} { set gcc_B_opt "-B$ld_testsuite_bindir/" } else { + # Delete tmpdir/ld first to remove tmpdir/ld/ld created by the + # previous LD_UNDER_TEST runs. + file delete -force tmpdir/ld if {![file isdirectory tmpdir/ld]} then { catch "exec mkdir tmpdir/ld" status - catch "exec ln -s ../../ld-new tmpdir/ld/ld" status + if [info exists env(LD_UNDER_TEST)] { + catch "exec ln -s $env(LD_UNDER_TEST) tmpdir/ld/ld" status + } else { + catch "exec ln -s ../../ld-new tmpdir/ld/ld" status + } catch "exec ln -s ld tmpdir/ld/collect-ld" status catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status } -- 2.44.0