!104 fix test fail

From: @shangyibin 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-06-15 09:04:44 +00:00 committed by Gitee
commit 893f40000c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 82 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up util-linux-2.36/login-utils/login.c.kzak util-linux-2.36/login-utils/login.c
--- util-linux-2.36/login-utils/login.c.kzak 2020-07-23 14:13:26.777030764 +0200
+++ util-linux-2.36/login-utils/login.c 2020-07-23 14:11:22.793686983 +0200
@@ -585,7 +585,7 @@ static void log_lastlog(struct login_con
sa.sa_handler = SIG_IGN;
sigaction(SIGXFSZ, &sa, &oldsa_xfsz);
- fd = open(_PATH_LASTLOG, O_RDWR, 0);
+ fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0);
if (fd < 0)
goto done;
offset = cxt->pwd->pw_uid * sizeof(ll);

View File

@ -0,0 +1,34 @@
From 72466ac801928c205604b99fe01f830809bda930 Mon Sep 17 00:00:00 2001
From: Liquor <lirui130@huawei.com>
Date: Thu, 17 Dec 2020 15:04:56 +0800
Subject: [PATCH] Add check to resolve uname26-version test failed
The uname command is modified in packages uname-build-checks,
but the uname26-version test case needs to use the uname -r query
result.As a result,the test fails.
So we add a judgment to check whether uname-build-checks is installed.
---
tests/ts/misc/setarch | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch
index 7c99cca..25d02c1 100755
--- a/tests/ts/misc/setarch
+++ b/tests/ts/misc/setarch
@@ -77,7 +77,12 @@ ts_finalize_subtest "$finmsg"
# conditional subtest
if [ "$uname26_seems_supported" = "yes" ]; then
ts_init_subtest uname26-version
- tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r)
+ rpm -qa | grep -q "uname-build-checks"
+ if [ $? -eq 0 ]; then
+ tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname.bin -r)
+ else
+ tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r)
+ fi
if echo "$tmp" | grep -q "^2\.6\."; then
echo "kernel version changed to 2.6" >> $TS_OUTPUT
else
--
2.27.0

View File

@ -0,0 +1,25 @@
From 1691faae5ed946ca6058bb9afaeb98b6b2e25f51 Mon Sep 17 00:00:00 2001
From: shangyibin <shangyibin@huawei.com>
Date: Mon, 10 Jan 2022 15:05:34 +0800
Subject: [PATCH] unshare: SKIPPED (no root permissions)
---
tests/ts/lsns/ioctl_ns | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns
index ef63606..a979893 100755
--- a/tests/ts/lsns/ioctl_ns
+++ b/tests/ts/lsns/ioctl_ns
@@ -21,7 +21,7 @@ TS_DESC="ownership and hierarchy"
. $TS_TOPDIR/functions.sh
ts_init "$*"
-# ts_skip_nonroot
+ts_skip_nonroot
grep -q '#define HAVE_LINUX_NSFS_H' ${top_builddir}/config.h || ts_skip "no ioctl_ns support"
[ -r /proc/self/ns/user ] || ts_skip "no USER namespace kernel support"
--
2.27.0

View File

@ -3,7 +3,7 @@
Name: util-linux Name: util-linux
Version: 2.37.2 Version: 2.37.2
Release: 2 Release: 3
Summary: A random collection of Linux utilities Summary: A random collection of Linux utilities
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
@ -18,6 +18,10 @@ Source7: util-linux-su-l.pamd
Source8: util-linux-runuser.pamd Source8: util-linux-runuser.pamd
Source9: util-linux-runuser-l.pamd Source9: util-linux-runuser-l.pamd
Patch0: 2.36-login-lastlog-create.patch
Patch1: Add-check-to-resolve-uname26-version-test-failed.patch
Patch2: SKIPPED-no-root-permissions-test.patch
BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel
BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc
@ -383,6 +387,12 @@ fi
%{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
%changelog %changelog
* Wed Jun 15 2022 shangyibin <shangyibin1@h-partners.com> - 2.37.2-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix test fail
* Thu Jun 09 2022 renhongxun<renhongxun@h-partners.com> - 2.37.2-2 * Thu Jun 09 2022 renhongxun<renhongxun@h-partners.com> - 2.37.2-2
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA