From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id B2F3E3858D28 for ; Sat, 17 Jun 2023 13:01:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2F3E3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 701C6313ACAA; Sat, 17 Jun 2023 15:01:10 +0200 (CEST) Received: by csb.redhat.com (Postfix, from userid 10916) id 50117DD100; Sat, 17 Jun 2023 15:01:10 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] tests: Really split run-copymany-sections.sh into separate tests Date: Sat, 17 Jun 2023 15:01:08 +0200 Message-Id: <20230617130108.572810-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3035.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,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: The previous commit 4fac1627c "tests: Split run-copymany-sections.sh into separate tests" duplicated the tests because they were still also done in the new test-copymany-subr.sh. Remove them really this time. Also don't source test-subr.sh twice, test-copymany-subr.sh already sources it, so the subtests don't have to also do it again. * tests/test-copymany-subr.sh: Remove actual tests. * tests/run-copymany-be32.sh: Remove . $srcdir/test-subr.sh. * tests/run-copymany-be64.sh: Likewise. * tests/run-copymany-le32.sh: Likewise. * tests/run-copymany-le64.sh: Likewise. Signed-off-by: Mark Wielaard --- tests/run-copymany-be32.sh | 1 - tests/run-copymany-be64.sh | 1 - tests/run-copymany-le32.sh | 1 - tests/run-copymany-le64.sh | 1 - tests/test-copymany-subr.sh | 44 +++---------------------------------- 5 files changed, 3 insertions(+), 45 deletions(-) diff --git a/tests/run-copymany-be32.sh b/tests/run-copymany-be32.sh index 8fdbfbf6..dc32e7a9 100755 --- a/tests/run-copymany-be32.sh +++ b/tests/run-copymany-be32.sh @@ -1,7 +1,6 @@ #! /bin/sh . $srcdir/test-copymany-subr.sh -. $srcdir/test-subr.sh # 32bit, big endian, rel testfiles testfile29 diff --git a/tests/run-copymany-be64.sh b/tests/run-copymany-be64.sh index bd7e50a4..1f06e077 100755 --- a/tests/run-copymany-be64.sh +++ b/tests/run-copymany-be64.sh @@ -1,7 +1,6 @@ #! /bin/sh . $srcdir/test-copymany-subr.sh -. $srcdir/test-subr.sh # 64bit, big endian, rel testfiles testfile23 diff --git a/tests/run-copymany-le32.sh b/tests/run-copymany-le32.sh index 82957d6c..d47a90ed 100755 --- a/tests/run-copymany-le32.sh +++ b/tests/run-copymany-le32.sh @@ -1,7 +1,6 @@ #! /bin/sh . $srcdir/test-copymany-subr.sh -. $srcdir/test-subr.sh # 32bit, little endian, rel testfiles testfile9 diff --git a/tests/run-copymany-le64.sh b/tests/run-copymany-le64.sh index a2d7c2ea..b563d9de 100755 --- a/tests/run-copymany-le64.sh +++ b/tests/run-copymany-le64.sh @@ -1,7 +1,6 @@ #! /bin/sh . $srcdir/test-copymany-subr.sh -. $srcdir/test-subr.sh # 64bit, little endian, rel testfiles testfile38 diff --git a/tests/test-copymany-subr.sh b/tests/test-copymany-subr.sh index 4b65d80e..054103b4 100755 --- a/tests/test-copymany-subr.sh +++ b/tests/test-copymany-subr.sh @@ -57,44 +57,6 @@ test_copy_and_add () # and non-ET_REL (with phdrs)/ET_REL (without phdrs). # Try to add 0x0fff sections twice. -# 32bit, big endian, rel -testfiles testfile29 -test_copy_and_add testfile29 -test_copy_and_add testfile29.copy - -# 64bit, big endian, rel -testfiles testfile23 -test_copy_and_add testfile23 -test_copy_and_add testfile23.copy - -# 32bit, little endian, rel -testfiles testfile9 -test_copy_and_add testfile9 -test_copy_and_add testfile9.copy - -# 64bit, little endian, rel -testfiles testfile38 -test_copy_and_add testfile38 -test_copy_and_add testfile38.copy - -# 32bit, big endian, non-rel -testfiles testfile26 -test_copy_and_add testfile26 -test_copy_and_add testfile26.copy - -# 64bit, big endian, non-rel -testfiles testfile27 -test_copy_and_add testfile27 -test_copy_and_add testfile27.copy - -# 32bit, little endian, non-rel -testfiles testfile -test_copy_and_add testfile -test_copy_and_add testfile.copy - -# 64bit, little endian, non-rel -testfiles testfile10 -test_copy_and_add testfile10 -test_copy_and_add testfile10.copy - -exit 0 +# Separated out into subtests +# run-copymany-be32.sh run-copymany-be64.sh +# run-copymany-le32.sh run-copymany-le64.sh -- 2.39.3