59 lines
1.5 KiB
Diff
59 lines
1.5 KiB
Diff
From c152f534a661e9f2cb0ee125e1087df3c389dcd9 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
|
|
|
|
Signed-off-by: zhoushuiqing <zhoushuiqing2@huawei.com>
|
|
---
|
|
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 e88fd59..abf544a 100755
|
|
--- a/tests/ima_hash.test
|
|
+++ b/tests/ima_hash.test
|
|
@@ -24,6 +24,11 @@ trap _report_exit_and_cleanup 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 2bc365a..eeb75ef 100755
|
|
--- a/tests/sign_verify.test
|
|
+++ b/tests/sign_verify.test
|
|
@@ -136,6 +136,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 verifykey
|
|
local FILE=${FILE:-$ALG.txt}
|
|
@@ -246,6 +251,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.33.0
|
|
|