From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 5F2C33858283 for ; Mon, 26 Sep 2022 14:11:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5F2C33858283 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-x32f.google.com with SMTP id t4so4591377wmj.5 for ; Mon, 26 Sep 2022 07:11:30 -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=WcfNyAgrxGQntfkSZiD3H5nKkitK4owSFspFhx6PPG0=; b=W5bVkFqYEX4JlMr3vTdVEkNhLUxtPhcz4gWK3VXkgfb876B3FwrOXYM1viAFMXEc1O 7McHpcb1sY7Avf9ekAEIOG9TUKHNJYuMmDO9/eYB1pMn6qlAdl5v2fVSPqkB5+N5VBvJ zhquc7Q9c30ubZug8JO+pLeocT9X6S906ehTxY59yuiOGSAI6SqyGvsG2YGvo4Mp8wid bP+pcOTuSjJiUU9ASdX21M/ufIlb8oDha7Vbi+DvAIgWBXM7AqImwfpObvfbOSiUyGUJ zBhDMkC3xEjyHl4ZZAxSe2X2cpwuAPGRRpQt9JtpcTYx8QSkdBj+lToOaRi3hx6co3Qj KrUw== 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=WcfNyAgrxGQntfkSZiD3H5nKkitK4owSFspFhx6PPG0=; b=cYElxTXQHwm8MYAsBE7UPPZ5qCw8JZ08Prtus6wPzyorfHC4mrcQ9pLr+XBmI1XMuq BzOnNwIsXah7wRhnVNryEcbUaHoTpi4ksHAa8McuryyegnWo7gV44ks8GUxVtIwPHKFp BcokerATaGHADztGcRWULaaocK1YRFLOBLyfNXjlUHP6ZlOslTmHaG61FnIjyWSaoB62 LmUYR4GFN06CeoiDiOnhzP1tiJWQo+WtAKcqnjNVME8Rlrw7PZ69pN5mohog9WAsShgL W92JxwwuCxc93erb4YXv3AfjZ5J5Vl+lEXq8sy531CgcTevemFuzPKcOArDHZpc0cWma GlSQ== X-Gm-Message-State: ACrzQf0tgfxvgEn0TzKhn8bcrdf12ZjISATrqwKbvpo3fwApGEoeSvKK T5wD7V5BZUQMhMlVtrgQqgXPYS3Yi9YYUA== X-Google-Smtp-Source: AMsMyM4eLUXNJ5wt4kT24IZsNMqCSaAwBsz3mNv1ISJePs+j2dPttJ3iXq4+2IvTJX1zEmez4Tkkow== X-Received: by 2002:a05:600c:410d:b0:3b4:9454:f894 with SMTP id j13-20020a05600c410d00b003b49454f894mr21859737wmi.111.1664201488060; Mon, 26 Sep 2022 07:11:28 -0700 (PDT) Received: from chigot-Dell.home ([2a01:cb15:8123:8100:b332:e6c2:bee9:735]) by smtp.gmail.com with ESMTPSA id z18-20020adff752000000b0022860e8ae7csm14606750wrp.77.2022.09.26.07.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 07:11:25 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH] binutils/testsuite: handle the different install names of c++filt Date: Mon, 26 Sep 2022 16:11:22 +0200 Message-Id: <20220926141122.164016-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.2 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: c++filt is always named cxxfilt in a build directory, but in a install directory it would be named either cxxfilt or c++filt (depending on the host). Handle this last case in testsuite. binutils/ChangeLog: * testsuite/config/default.exp (CXXFILE): if cxxfilt not found, try c++filt. --- binutils/testsuite/config/default.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp index c654bd4081c..68f5bcb1102 100644 --- a/binutils/testsuite/config/default.exp +++ b/binutils/testsuite/config/default.exp @@ -92,7 +92,10 @@ if ![info exists DLLTOOL] then { set DLLTOOL [findfile $base_dir/dlltool] } if ![info exists CXXFILT] then { - set CXXFILT [findfile $base_dir/cxxfilt] + set CXXFILT [findfile $base_dir/cxxfilt $base_dir/cxxfilt [which [transform cxxfilt]]] + if {$CXXFILT == 0} then { + set CXXFILT [transform c++filt] + } } if ![info exists CXXFILTFLAGS] then { set CXXFILTFLAGS "" -- 2.25.1