summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <[email protected]>2023-06-17 14:56:12 +0200
committerMark Wielaard <[email protected]>2023-06-17 14:56:12 +0200
commit4ef4fea4a8c3ae69cb3259f073dfc53d261b263b (patch)
tree23936424d803ca850d49813afeb7c232d7fdb0a6
parent4fac1627c2c690070d9a79981c57eddf848178e6 (diff)
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 <[email protected]>
-rwxr-xr-xtests/run-copymany-be32.sh1
-rwxr-xr-xtests/run-copymany-be64.sh1
-rwxr-xr-xtests/run-copymany-le32.sh1
-rwxr-xr-xtests/run-copymany-le64.sh1
-rwxr-xr-xtests/test-copymany-subr.sh44
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