diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2024-02-08 22:57:59 +0100 |
|---|---|---|
| committer | Martin Jansa <martin.jansa@gmail.com> | 2024-02-26 18:10:47 +0100 |
| commit | d3fecf856850645762a9dcad5160686b2445729d (patch) | |
| tree | e0123cd6ef1d6f57a5e361e751745941f582863e | |
| parent | 7dce39acc7d2f5ff07dccc96140190ae52ab5e35 (diff) | |
| download | meta-openembedded-contrib-jansa/master-xfstests-debug.tar.gz | |
xfstests: add extra sleep in mkgroupfile to reproduce the racejansa/master-xfstests-debug
* also rm the group.list file for each do_install, to force
recreating them every time
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
| -rw-r--r-- | meta-filesystems/recipes-utils/xfstests/xfstests/0005-mkgroupfile-extra-sleep.patch | 26 | ||||
| -rw-r--r-- | meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb | 2 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0005-mkgroupfile-extra-sleep.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0005-mkgroupfile-extra-sleep.patch new file mode 100644 index 0000000000..f2b5bef972 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0005-mkgroupfile-extra-sleep.patch @@ -0,0 +1,26 @@ +From 13f5c103a089f4a02532b7f57ea0221f84d7106f Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Thu, 8 Feb 2024 22:54:57 +0100 +Subject: [PATCH 5/6] mkgroupfile: extra sleep + +Upstream-Status: Pending +--- + tools/mkgroupfile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/mkgroupfile b/tools/mkgroupfile +index 31728cd3..f0dfe5b1 100755 +--- a/tools/mkgroupfile ++++ b/tools/mkgroupfile +@@ -85,6 +85,8 @@ if [ -z "$groupfile" ] || [ "$groupfile" = "-" ]; then + else + # Otherwise, write the group file to disk somewhere. + generate_groupfile ++ echo "MJ: $0 in `pwd` sleep 30" ++ sleep 30 + echo "MJ: $0 in `pwd` mv -vf \"$new_groups\" \"$groupfile\"" + mv -vf "$new_groups" "$groupfile" || echo "MJ: ERROR: mv -vf \"$new_groups\" \"$groupfile\"" + fi +-- +2.43.0 + diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb index f7f5bfe59d..0d8ce1f754 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb @@ -12,6 +12,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \ file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ file://0003-tests-Makefile-make-sure-group.list-DIRT-exists-befo.patch \ file://0003-install-sh-use-x.patch \ + file://0005-mkgroupfile-extra-sleep.patch \ " S = "${WORKDIR}/git" @@ -54,6 +55,7 @@ do_configure:prepend() { do_install() { # otherwise install-sh duplicates DESTDIR prefix export DIST_ROOT="/" DIST_MANIFEST="" DESTDIR="${D}" + rm -vf ${S}/tests/*/group.list oe_runmake install unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite |