From 57e5096d7377960e2af63335aea863635a499681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= <shenzhongwei@kylinos.cn>
Date: Thu, 8 Aug 2024 17:47:33 +0800
Subject: [PATCH] fix loongarch test error

---
 backport-fix_loongarch_test_error.patch | 34 +++++++++++++++++++++++++
 util-linux.spec                         |  9 ++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 backport-fix_loongarch_test_error.patch

diff --git a/backport-fix_loongarch_test_error.patch b/backport-fix_loongarch_test_error.patch
new file mode 100644
index 0000000..33402c2
--- /dev/null
+++ b/backport-fix_loongarch_test_error.patch
@@ -0,0 +1,34 @@
+diff -Naur util-linux-2.39.1.bak/tests/ts/fincore/count util-linux-2.39.1/tests/ts/fincore/count
+--- util-linux-2.39.1.bak/tests/ts/fincore/count	2024-05-27 09:06:52.130632958 +0800
++++ util-linux-2.39.1/tests/ts/fincore/count	2024-05-27 09:07:46.651036787 +0800
+@@ -107,6 +107,7 @@
+ 	OUT_COLUMNS="PAGES,SIZE,FILE"
+ else
+ 	TS_EXPECTED+=".nosize"
++	TS_EXPECTED_ERR+=".nosize"
+ 	OUT_COLUMNS="PAGES,FILE"
+ fi
+ 
+@@ -119,11 +120,11 @@
+ INPUT=
+ input=
+ 
++ts_log_both "[ NO EXCITING FILE ]"
+ {
+     input=no_such_file
+     INPUT="${INPUT} ${input}"
+ 
+-    ts_log_both "[ NO EXCITING FILE ]"
+     $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes --noheadings $input
+     footer "$?"
+ } >> $TS_OUTPUT 2>> $TS_ERRLOG
+@@ -220,8 +221,8 @@
+ 		   "oflag=append seek=$hole_count"
+ } >> $TS_OUTPUT 2>> $TS_ERRLOG
+ 
++ts_log_both "[ MULTIPLE FILES ]"
+ {
+-    ts_log_both "[ MULTIPLE FILES ]"
+     $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes $INPUT
+     footer "$?"
+ } >> $TS_OUTPUT 2>> $TS_ERRLOG
diff --git a/util-linux.spec b/util-linux.spec
index 9b9f440..ec91d4e 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -3,7 +3,7 @@
 
 Name:           util-linux
 Version:        2.39.1
-Release:        9
+Release:        10
 Summary:        A random collection of Linux utilities
 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
@@ -38,6 +38,7 @@ Patch6016:      backport-libmount-improve-mnt_table_next_child_fs.patch
 Patch6017:      backport-libmount-make-sure-option-is-used-as-string.patch
 Patch6018:      backport-libmount-fix-possible-memory-leak.patch
 Patch6019:      backport-libmount-Fix-atime-remount-for-new-API.patch
+Patch6020:      backport-fix_loongarch_test_error.patch
 
 Patch9000:      SKIPPED-no-root-permissions-test.patch
 %ifarch sw_64
@@ -424,6 +425,12 @@ fi
 %endif
 
 %changelog
+* Thu Apr 08 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 2.39.1-10
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix loongarch test error
+
 * Wed Jul 3 2024 zhangyao <zhangyao108@huawei.com> - 2.39.1-9
 - Type:bugfix
 - CVE:NA
-- 
Gitee