Skip to contentSkip to conversation

ltp: Update to 20210524

PATCH Superseded Petr Vorel 2 participants 3 messages May 24, 2021 – May 25, 2021

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 1/1 ltp: Update to 20210524

Remove patches accepted in this upstream release
* determinism.patch (45530792a, 01fefa08c)
* libswapon.patch (2b64c727f)
* 0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch (f38172209)
* 0002-Makefile-Avoid-wildcard-determinism-issues.patch (edf60cf6a)
* 0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch (ac140ed58)

Removed (test rewritten to new API)
* 0007-Fix-test_proc_kill-hanging.patch

---
Changes v1->v2:
* update patches list in ltp_20210524.bb
(forget to remove removed patches)

Sorry for invalid previous patch.

Kind regards,
Petr

 ...uite-generate-makefiles.sh-Avoid-inc.patch |  40 --
 ...le-Avoid-wildcard-determinism-issues.patch | 310 ---------------
 ...-swapoff-Move-common-library-to-libs.patch | 133 -------
 .../ltp/0007-Fix-test_proc_kill-hanging.patch |  32 --
 .../ltp/ltp/determinism.patch                 |  43 --
 meta/recipes-extended/ltp/ltp/libswapon.patch | 368 ------------------
 .../ltp/{ltp_20210121.bb => ltp_20210524.bb}  |   7 +-
 7 files changed, 1 insertion(+), 932 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/determinism.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/libswapon.patch
 rename meta/recipes-extended/ltp/{ltp_20210121.bb => ltp_20210524.bb} (94%)
meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch deleted +0 -40
deleted file mode 100644
index c2a70dcb67..0000000000
@@ -1,40 +0,0 @@
-From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001
-From: Richard Purdie <[email protected]>
-Date: Tue, 9 Mar 2021 15:21:11 +0000
-Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid
- inconsistencies with make version
-
-With make 4.1, INSTALL_TARGETS+=<tab> will add a space to the variable whereas
-with make 4.3, it will not. This leads to differing run.sh files in installed
-in packages which is undesireable. If tests is empty we don't have to add
-the line to the makefiles at all which seems like the easiest way to
-avoid the differences in make behaviour.
-
-Signed-off-by: Richard Purdie <[email protected]>
-Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021386.html]
-
----
- .../open_posix_testsuite/scripts/generate-makefiles.sh      | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-index 200a631db..4b3aaa4a0 100755
---- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-+++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-@@ -148,8 +148,12 @@ EOF
- 
- 	fi
- 
--	cat >> "$makefile.2" <<EOF
-+	if [ ! -z "${tests}" ]; then
-+		cat >> "$makefile.2" <<EOF
- INSTALL_TARGETS+=	${tests}
-+EOF
-+	fi
-+	cat >> "$makefile.2" <<EOF
- MAKE_TARGETS+=		${targets}
- 
- EOF
--- 
-2.27.0
-
meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch deleted +0 -310

310 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch deleted +0 -133

133 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch deleted +0 -32
deleted file mode 100644
index 0e7264574f..0000000000
@@ -1,32 +0,0 @@
-From f4fafbdffae3a63c81f65cef98c72dda26283e06 Mon Sep 17 00:00:00 2001
-From: Dengke Du <[email protected]>
-Date: Wed, 8 Feb 2017 16:17:17 +0800
-Subject: [PATCH] Fix test_proc_kill hanging
-
-Sometimes the signal is delivered to memcg_process before the framework took
-into consideration its pid entered in the tasks. Fixed by delaying the signal
-send command.
-
-Upstream-Status: Pending
-
-Signed-off-by: George Nita <[email protected]>
-Signed-off-by: Dengke Du <[email protected]>
----
- testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-index aadaae4..deea5d6 100755
---- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-@@ -291,6 +291,7 @@ test_proc_kill()
- 	pid=$!
- 	TST_CHECKPOINT_WAIT 0
- 	echo $pid > tasks
-+	sleep 1
- 
- 	signal_memcg_process $pid $3
- 
--- 
-2.7.4
-
meta/recipes-extended/ltp/ltp/determinism.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/libswapon.patch deleted +0 -368

368 lines not on this page · raw message

meta/recipes-extended/ltp/ltp_20210524.bb renamed from meta/recipes-extended/ltp/ltp_20210121.bb +1 -6
similarity index 94%
rename from meta/recipes-extended/ltp/ltp_20210121.bb
rename to meta/recipes-extended/ltp/ltp_20210524.bb
index e1ffd0ddf4..bf6e564482 100644
@@ -27,19 +27,14 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
+SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
 
 # remove at next version upgrade or when output changes
 PR = "r4"
 HASHEQUIV_HASH_VERSION .= ".4"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
-           file://0007-Fix-test_proc_kill-hanging.patch \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
-           file://determinism.patch \
-           file://0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch \
-           file://0002-Makefile-Avoid-wildcard-determinism-issues.patch \
-           file://0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch \
            file://disable_hanging_tests.patch \
            "
 
Signature · 1 line
2.31.1
#1 lore raw

Hello!

On Mon, 24 May 2021 at 13:30, Petr Vorel <[email protected]> wrote:
[...]

Quoted 8 lines
meta/recipes-extended/ltp/ltp_20210524.bb renamed from meta/recipes-extended/ltp/ltp_20210121.bb +0 -0
similarity index 94%
rename from meta/recipes-extended/ltp/ltp_20210121.bb
rename to meta/recipes-extended/ltp/ltp_20210524.bb
index e1ffd0ddf4..bf6e564482 100644

meta/recipes-extended/ltp/ltp_20210524.bb CFLAGS_append_x86-64 = " -fomit-frame-pointer" · line 34

Quoted 9 lines
meta/recipes-extended/ltp/ltp_20210524.bb renamed from meta/recipes-extended/ltp/ltp_20210121.bb +1 -1
@@ -27,19 +27,14 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
+SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
 
 # remove at next version upgrade or when output changes
 PR = "r4"
 HASHEQUIV_HASH_VERSION .= ".4"

Shall we reset/remove this?

Greetings!

Daniel Díaz
[email protected]

author
#2 lore raw

Hi Daniel,

Quoted 18 lines

Hello!

On Mon, 24 May 2021 at 13:30, Petr Vorel <[email protected]> wrote:
[...]

Quoted 13 lines
meta/recipes-extended/ltp/ltp_20210524.bb renamed from meta/recipes-extended/ltp/ltp_20210121.bb +1 -1
similarity index 94%
rename from meta/recipes-extended/ltp/ltp_20210121.bb
rename to meta/recipes-extended/ltp/ltp_20210524.bb
index e1ffd0ddf4..bf6e564482 100644
@@ -27,19 +27,14 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
+SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
Quoted 5 lines

meta/recipes-extended/ltp/ltp_20210524.bb CFLAGS_append_x86-64 = " -fomit-frame-pointer" · line 34

Quoted 3 lines
meta/recipes-extended/ltp/ltp_20210524.bb renamed from meta/recipes-extended/ltp/ltp_20210121.bb +0 -0
 # remove at next version upgrade or when output changes
 PR = "r4"
 HASHEQUIV_HASH_VERSION .= ".4"

Shall we reset/remove this?

Thanks, yes it should have been removed.
I'll try to send v3 tonight.

Kind regards,
Petr

Quoted 4 lines

Greetings!

Daniel Díaz
[email protected]