2022-10-29 09:38:54 +08:00
|
|
|
From d3a4e24f6a2bac023f7e7c0eda403f0d8e25996d Mon Sep 17 00:00:00 2001
|
2022-09-26 18:38:22 +08:00
|
|
|
From: shenxiangwei <shenxiangwei1@huawei.com>
|
|
|
|
|
Date: Mon, 26 Sep 2022 19:36:25 +0800
|
|
|
|
|
Subject: [PATCH] Skip test error in docker
|
|
|
|
|
|
|
|
|
|
---
|
2022-10-29 09:38:54 +08:00
|
|
|
tests/ima_hash.test | 5 +++++
|
2022-09-26 18:38:22 +08:00
|
|
|
tests/sign_verify.test | 10 ++++++++++
|
2022-10-29 09:38:54 +08:00
|
|
|
2 files changed, 15 insertions(+)
|
2022-09-26 18:38:22 +08:00
|
|
|
|
2022-10-29 09:38:54 +08:00
|
|
|
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
|
|
|
|
|
|
2022-09-26 18:38:22 +08:00
|
|
|
diff --git a/tests/sign_verify.test b/tests/sign_verify.test
|
2022-10-29 09:38:54 +08:00
|
|
|
index 288e133..e1899df 100644
|
2022-09-26 18:38:22 +08:00
|
|
|
--- a/tests/sign_verify.test
|
|
|
|
|
+++ b/tests/sign_verify.test
|
2022-10-29 09:38:54 +08:00
|
|
|
@@ -130,6 +130,11 @@ check_sign() {
|
2022-09-26 18:38:22 +08:00
|
|
|
# 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
|
2022-10-29 09:38:54 +08:00
|
|
|
+ return "$SKIP"
|
2022-09-26 18:38:22 +08:00
|
|
|
+ fi
|
|
|
|
|
+
|
|
|
|
|
local "$@"
|
2022-10-29 09:38:54 +08:00
|
|
|
local KEY=${KEY%.*}.key
|
2022-09-26 18:38:22 +08:00
|
|
|
local FILE=${FILE:-$ALG.txt}
|
2022-10-29 09:38:54 +08:00
|
|
|
@@ -225,6 +230,11 @@ check_verify() {
|
2022-09-26 18:38:22 +08:00
|
|
|
# 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
|
|
|
|
|
--
|
2022-10-29 09:38:54 +08:00
|
|
|
2.37.3.windows.1
|
2022-09-26 18:38:22 +08:00
|
|
|
|