From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 31E21385BF9C for ; Fri, 26 Feb 2021 10:14:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 31E21385BF9C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 3149EAF47; Fri, 26 Feb 2021 10:14:25 +0000 (UTC) Date: Fri, 26 Feb 2021 11:14:23 +0100 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com, mark@klomp.org Subject: [PATCH][testsuite] Fix pr25109.sh on riscv64 Message-ID: <20210226101421.GA29849@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Fri, 26 Feb 2021 10:14:27 -0000 Hi, On riscv64, I run into: ... cc main.c no-multifile-prop-dw.S -o no-multifile-prop no-multifile-prop-dw.S: Assembler messages: no-multifile-prop-dw.S:25: Error: non-constant .uleb128 is not supported make: *** [Makefile:99: no-multifile-prop] Error 1 ... Fix this by allowing to fail to build the test-case, and marking it as unsupported. Any comments? Thanks, - Tom [testsuite] Fix pr25109.sh on riscv64 2021-02-26 Tom de Vries * Makefile (no-multifile-prop): Add target rule. * testsuite/dwz.tests/dwz-tests.exp: Require no-multifile-prop for pr25109.sh. --- Makefile | 6 +++++- testsuite/dwz.tests/dwz-tests.exp | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d320266..7969490 100644 --- a/Makefile +++ b/Makefile @@ -95,9 +95,13 @@ $(TEMP_ASM_FILES): %-dw.S: $(TEST_SRC)/../lib/%.exp export DEJAGNU=$(DEJAGNU); \ runtest --tool=dwz -srcdir $(srcdir)/testsuite/ lib/$*.exp -$(TEST_EXECS_DWARF_ASM): %: %-dw.S +$(filter-out no-multifile-prop, $(TEST_EXECS_DWARF_ASM)): %: %-dw.S $(CC) $(TEST_SRC)/main.c $< -o $@ +# Fails to compile on riscv64: Error: non-constant .uleb128 is not supported. +no-multifile-prop: %: %-dw.S + $(CC) $(TEST_SRC)/main.c $< -o $@ || true + odr-struct: $(CXX) $(TEST_SRC)/odr.cc $(TEST_SRC)/odr-2.cc -I$(TEST_SRC) -o $@ -g \ -DKIND=struct diff --git a/testsuite/dwz.tests/dwz-tests.exp b/testsuite/dwz.tests/dwz-tests.exp index 48c0015..0ad77ea 100644 --- a/testsuite/dwz.tests/dwz-tests.exp +++ b/testsuite/dwz.tests/dwz-tests.exp @@ -86,6 +86,9 @@ foreach test $tests { continue } } + if { $basename == "pr25109.sh" } { + lappend required_execs no-multifile-prop + } set unsupported 0 foreach required_exec $required_execs {