Skip to contentSkip to conversation

tar: add ptest support

PATCH Superseded [email protected] 2 participants 2 messages Sep 26, 2023

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/1 tar: add ptest support

From: Qiu Tingting <[email protected]>

Add a ptest for tar.
- It is taking around 3m to execute with kvm, so added it to PTEST_SLOW.
- It contains 244 cases.
- Below is parts of the run log:
START: ptest-runner
2023-09-26T08:37
BEGIN: /usr/lib/tar/ptest
## ------------------------ ##
## GNU tar 1.35 test suite. ##
## ------------------------ ##
PASS: tar version
PASS: decompressing from stdin
...
200 tests were successful.
44 tests were skipped.
DURATION: 190
END: /usr/lib/tar/ptest
2023-09-26T08:40
STOP: ptest-runner
TOTAL: 1 FAIL: 0

---
 .../distro/include/ptest-packagelists.inc     |   1 +
 meta/recipes-core/images/core-image-ptest.bb  |   3 +
 .../tar/tar/0001-tests-fix-TESTSUITE_AT.patch | 228 ++++++++++++++++++
 ...2-tests-check-for-recently-fixed-bug.patch |  60 +++++
 ...rectory-with-writing-from-an-archive.patch | 112 +++++++++
 meta/recipes-extended/tar/tar/run-ptest       |  14 ++
 meta/recipes-extended/tar/tar_1.35.bb         |  34 +++
 7 files changed, 452 insertions(+)
 create mode 100644 meta/recipes-extended/tar/tar/0001-tests-fix-TESTSUITE_AT.patch
 create mode 100644 meta/recipes-extended/tar/tar/0002-tests-check-for-recently-fixed-bug.patch
 create mode 100644 meta/recipes-extended/tar/tar/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch
 create mode 100644 meta/recipes-extended/tar/tar/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
index 9160103cb0..3df7c9e405 100644
@@ -109,6 +109,7 @@ PTESTS_SLOW = "\
     python3-cryptography \
     python3 \
     strace \
+    tar \
     tcl \
     util-linux \
     valgrind \
meta/recipes-core/images/core-image-ptest.bb +3 -0
index b81ab7b7c8..b6f5c2fd60 100644
@@ -24,6 +24,9 @@ IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-mdadm = "1524288"
 IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-strace = "1024288"
 IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288"
 
+# tar-ptest in particular needs more space
+IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-tar = "1524288"
+
 # ptests need more memory than standard to avoid the OOM killer
 QB_MEM = "-m 1024"
 QB_MEM:virtclass-mcextend-lttng-tools = "-m 4096"
meta/recipes-extended/tar/tar/0001-tests-fix-TESTSUITE_AT.patch new file +228 -0

228 lines not on this page · raw message

meta/recipes-extended/tar/tar/0002-tests-check-for-recently-fixed-bug.patch new file +60 -0

60 lines not on this page · raw message

meta/recipes-extended/tar/tar/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch new file +112 -0

112 lines not on this page · raw message

meta/recipes-extended/tar/tar/run-ptest new file +14 -0
new file mode 100644
index 0000000000..185b33d61a
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Define tar test work dir
+WORKDIR=@PTEST_PATH@/tests/
+
+# Run test
+cd ${WORKDIR}
+./atconfig ./atlocal ./testsuite
+
+# clear log
+rm -rf testsuite.dir
+rm -rf testsuite.log
+
+./testsuite --am-fmt
meta/recipes-extended/tar/tar_1.35.bb +34 -0
index 4dbd418b60..c7bd1d195e 100644
@@ -42,6 +42,40 @@ do_install:append:class-target() {
     fi
 }
 
+# add for ptest support
+SRC_URI += " \
+    file://run-ptest \
+    file://0001-tests-fix-TESTSUITE_AT.patch \
+    file://0002-tests-check-for-recently-fixed-bug.patch \
+    file://0003-Exclude-VCS-directory-with-writing-from-an-archive.patch \
+"
+
+inherit ptest
+
+do_compile_ptest() {
+    oe_runmake -C ${B}/gnu/ check
+    oe_runmake -C ${B}/lib/ check
+    oe_runmake -C ${B}/rmt/ check
+    oe_runmake -C ${B}/src/ check
+    rm -rf ${S}/tests/testsuite
+    oe_runmake -C ${B}/tests/ testsuite
+    oe_runmake -C ${B}/tests/ genfile checkseekhole ckmtime
+}
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests/
+    install --mode=755 ${B}/tests/atconfig ${D}${PTEST_PATH}/tests/
+    sed -i "/abs_/d" ${D}${PTEST_PATH}/tests/atconfig
+    echo "abs_builddir=${PTEST_PATH}/tests/" >> ${D}${PTEST_PATH}/tests/atconfig
+    install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/
+    sed -i "/PATH=/d" ${D}${PTEST_PATH}/tests/atlocal
+    install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/
+    install --mode=755 ${B}/tests/checkseekhole ${D}${PTEST_PATH}/tests/
+    install --mode=755 ${B}/tests/ckmtime ${D}${PTEST_PATH}/tests/
+    install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/
+    sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest
+}
+
 PACKAGES =+ "${PN}-rmt"
 
 FILES:${PN}-rmt = "${sbindir}/rmt*"
Signature · 1 line
2.25.1
#1 lore raw
Quoted 1 line · On Tue, 26 Sept 2023 at 11:17, [email protected] <[email protected]> wrote:

+Upstream-Status: Submitted [https://git.savannah.gnu.org/cgit/tar.git/commit/?id=39849e9d91f477d3fb839f93cd0815d0cb3273e9]

Thanks, this is nearly fine, only this line should say:

Upstream-Status: Backport
[https://git.savannah.gnu.org/cgit/tar.git/commit/?id=39849e9d91f477d3fb839f93cd0815d0cb3273e9]

'Submitted' means the patch was sent upstream, but is in review and has not yet been merged into the trunk development branch. It also needs a link to the upstream submission (e.g. github pull request, or an email thread in the mailing list archive).

'Backport' is when the patch is already in that branch, and is expected to be included automatically in the next release.

Alex