Open Build Service

Changes of Revision 10

_service:tar_scm_kernel_repo:ima-evm-utils.spec Changed

_service:tar_scm_kernel_repo:skip-test-error-in-docker.patch Added

@@ -0,0 +1,57 @@
+From d3a4e24f6a2bac023f7e7c0eda403f0d8e25996d Mon Sep 17 00:00:00 2001
+From: shenxiangwei <shenxiangwei1@huawei.com>
+Date: Mon, 26 Sep 2022 19:36:25 +0800
+Subject: [PATCH] Skip test error in docker
+
+---
+ tests/ima_hash.test    |  5 +++++
+ tests/sign_verify.test | 10 ++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/tests/ima_hash.test b/tests/ima_hash.test
+index 8d66e59..cd97e1d 100644
+--- a/tests/ima_hash.test
++++ b/tests/ima_hash.test
+@@ -24,6 +24,11 @@ trap _report_exit EXIT
+ set -f # disable globbing
+ 
+ check() {
++  cat /proc/fs/ext4/sda1/options | grep xattr
++  if [ `echo $?` -ne 0 ];then
++          return "$SKIP"
++  fi
++
+   local alg=$1 prefix=$2 chash=$3 hash
+   local file=$alg-hash.txt
+ 
+diff --git a/tests/sign_verify.test b/tests/sign_verify.test
+index 288e133..e1899df 100644
+--- a/tests/sign_verify.test
++++ b/tests/sign_verify.test
+@@ -130,6 +130,11 @@ check_sign() {
+   # PREFIX (signature header prefix in hex),
+   # OPTS (additional options for evmctl),
+   # FILE (working file to sign).
++  cat /proc/fs/ext4/sda1/options | grep xattr
++  if [ `echo $?` -ne 0 ];then
++          return "$SKIP"
++  fi
++
+   local "$@"
+   local KEY=${KEY%.*}.key
+   local FILE=${FILE:-$ALG.txt}
+@@ -225,6 +230,11 @@ check_verify() {
+   # ALG (hash algo),
+   # OPTS (additional options for evmctl),
+   # FILE (filename to verify).
++  cat /proc/fs/ext4/sda1/options | grep xattr
++  if [ `echo $?` -ne 0 ];then
++	  return "$SKIP"
++  fi
++
+   local "$@"
+ 
+   # shellcheck disable=SC2086
+-- 
+2.37.3.windows.1
+