From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by sourceware.org (Postfix) with ESMTPS id 868453858416 for ; Wed, 12 Jan 2022 05:15:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 868453858416 Received: from dggeme758-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4JYbNJ74HVzbjwp; Wed, 12 Jan 2022 13:14:56 +0800 (CST) Received: from huawei.com (10.175.104.170) by dggeme758-chm.china.huawei.com (10.3.19.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Wed, 12 Jan 2022 13:15:36 +0800 From: Lv Ying To: , , CC: , Subject: [PATCH] [testsuite] fix Handle readelf following links by default(b1f26dc76158e) Date: Thu, 13 Jan 2022 05:29:44 +0800 Message-ID: <1642022984-19556-1-git-send-email-lvying6@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggeme758-chm.china.huawei.com (10.3.19.104) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_12_24, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2022 05:15:41 -0000 The two testcases still failed when using newer readelf(binutils commit c46b706620e): testsuite/dwz.tests/odr-struct-multifile.sh testsuite/dwz.tests/cycle.sh fix the new -Wn readelf flag test Signed-off-by: Lv Ying --- testsuite/dwz.tests/cycle.sh | 2 +- testsuite/dwz.tests/odr-struct-multifile.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/dwz.tests/cycle.sh b/testsuite/dwz.tests/cycle.sh index 85aa556..17f8eb5 100644 --- a/testsuite/dwz.tests/cycle.sh +++ b/testsuite/dwz.tests/cycle.sh @@ -1,5 +1,5 @@ readelf_flags="" -if readelf -h 2>&1 | grep -q "\-wN,"; then +if readelf -h 2>&1 | grep -q "\-wN"; then readelf_flags=-wN fi diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh index 20b682b..159cbc3 100644 --- a/testsuite/dwz.tests/odr-struct-multifile.sh +++ b/testsuite/dwz.tests/odr-struct-multifile.sh @@ -3,7 +3,7 @@ if ! $execs/dwz-for-test --odr -v 2>/dev/null; then fi readelf_flags="" -if readelf -h 2>&1 | grep -q "\-wN,"; then +if readelf -h 2>&1 | grep -q "\-wN"; then readelf_flags=-wN fi -- 2.27.0