tests: Really split run-copymany-sections.sh into separate tests

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 <mark@klomp.org>

diff --git a/tests/run-copymany-be32.sh b/tests/run-copymany-be32.sh
index 8fdbfbf69b318c26e205a80d5287e2d186a2a658..dc32e7a99f6df95ed128ce9817987500fe65c9e2 100755 (executable)
--- 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 bd7e50a453c5d661883d2515097634e39c9825b2..1f06e077705b794648339413c513db791d551d5e 100755 (executable)
--- 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 82957d6c8d2836334fdcfc2fdac279c705af8b76..d47a90edde80f9f582659c6d51705c6755d223f6 100755 (executable)
--- 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 a2d7c2ea4aca80a72326ffff63fbf337e08d2901..b563d9de49585dcb92d41a3f270a88dd30fe7bf1 100755 (executable)
--- 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 4b65d80e6a0fa5a75b40b726455c0fc091249c53..054103b40b31b740ef8df407a2bff9183637b407 100755 (executable)
--- 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