提交 fb686cb6 编写于 作者: D dhy308

Fix review issues.

Issue: I6AEEI
Test: Build & Boot Devices
Signed-off-by: Ndhy308 <tony.gan@huawei.com>
上级 8ae64692
......@@ -38,15 +38,6 @@ static bool sigchain_special_handler2(int signo, siginfo_t *siginfo, void *ucont
return true;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler3(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_add_special_handler_004", true);
return false;
}
/**
* @tc.name : sigchain_add_special_handler_004
* @tc.desc : Add multiple special handlers for a signal that is not registered with
......@@ -69,16 +60,15 @@ static void sigchain_add_special_handler_004()
};
add_special_signal_handler(SIGABRT, &sigabrt1);
struct signal_chain_action sigabrt2 = {
.sca_sigaction = sigchain_special_handler3,
.sca_mask = {},
.sca_flags = 0,
};
add_special_signal_handler(SIGABRT, &sigabrt2);
sigset_t set = {0};
int signo[SIGCHIAN_TEST_SIGNAL_NUM_1] = {SIGABRT};
SIGCHAIN_TEST_SET_MASK(set, "sigchain_add_special_handler_001", signo, SIGCHIAN_TEST_SIGNAL_NUM_1);
}
int main(void)
{
sigchain_add_special_handler_004();
raise(SIGABRT);
raise(SIGABRT);
return t_status;
}
\ No newline at end of file
......@@ -38,15 +38,6 @@ static bool sigchain_special_handler2(int signo, siginfo_t *siginfo, void *ucont
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler3(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_add_special_handler_005", true);
return false;
}
/**
* @brief the signal handler
*/
......@@ -79,16 +70,15 @@ static void sigchain_add_special_handler_005()
};
add_special_signal_handler(SIGABRT, &sigabrt1);
struct signal_chain_action sigabrt2 = {
.sca_sigaction = sigchain_special_handler3,
.sca_mask = {},
.sca_flags = 0,
};
add_special_signal_handler(SIGABRT, &sigabrt2);
sigset_t set = {0};
int signo[SIGCHIAN_TEST_SIGNAL_NUM_1] = {SIGABRT};
SIGCHAIN_TEST_SET_MASK(set, "sigchain_add_special_handler_001", signo, SIGCHIAN_TEST_SIGNAL_NUM_1);
}
int main(void)
{
sigchain_add_special_handler_005();
raise(SIGABRT);
raise(SIGABRT);
return t_status;
}
\ No newline at end of file
......@@ -38,15 +38,6 @@ static bool sigchain_special_handler2(int signo, siginfo_t *siginfo, void *ucont
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler3(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_add_special_handler_006", true);
return false;
}
/**
* @brief the signal handler
*/
......@@ -82,19 +73,15 @@ static void sigchain_add_special_handler_006()
};
add_special_signal_handler(SIGABRT, &sigabrt2);
struct signal_chain_action sigabrt3 = {
.sca_sigaction = sigchain_special_handler3,
.sca_mask = {},
.sca_flags = 0,
};
add_special_signal_handler(SIGABRT, &sigabrt3);
sigset_t set = {0};
int signo[SIGCHIAN_TEST_SIGNAL_NUM_1] = {SIGABRT};
SIGCHAIN_TEST_SET_MASK(set, "sigchain_add_special_handler_001", signo, SIGCHIAN_TEST_SIGNAL_NUM_1);
}
int main(void)
{
sigchain_add_special_handler_006();
raise(SIGSEGV);
raise(SIGSEGV);
raise(SIGSEGV);
raise(SIGABRT);
raise(SIGABRT);
return t_status;
}
\ No newline at end of file
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <sigchain.h>
#include <wchar.h>
#include <stdlib.h>
#include "test.h"
#include "functionalext.h"
#include "sigchain_util.h"
/**
* @brief the special handler
*/
static bool sigchain_special_handler(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_add_special_handler_013", true);
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler1(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_add_special_handler_013", true);
return false;
}
/**
* @brief the signal handler
*/
static void signal_handler(int signo)
{
EXPECT_EQ("sigchain_add_special_handler_013", signo, SIGABRT);
return;
}
/**
* @tc.name : sigchain_add_special_handler_013
* @tc.desc : Add the special handler with wrong signal
* @tc.level : Level 2
*/
static void sigchain_add_special_handler_013()
{
signal(SIGABRT, signal_handler);
struct signal_chain_action sig_special_action = {
.sca_sigaction = sigchain_special_handler,
.sca_mask = {},
.sca_flags = 0,
};
add_special_signal_handler(0, &sig_special_action);
struct signal_chain_action sig_special_action1 = {
.sca_sigaction = sigchain_special_handler1,
.sca_mask = {},
.sca_flags = 0,
};
add_special_signal_handler(SIGCHAIN_SIGNAL_65, &sig_special_action1);
}
int main(void)
{
sigchain_add_special_handler_013();
return t_status;
}
\ No newline at end of file
......@@ -38,15 +38,6 @@ static bool sigchain_special_handler2(int signo, siginfo_t *siginfo, void *ucont
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler3(int signo, siginfo_t* siginfo, void* ucontext_raw)
{
EXPECT_FALSE("sigchain_rm_special_handler_004", true);
return false;
}
/**
* @tc.name : sigchain_rm_special_handler_004
* @tc.desc : remove multiple special handlers for a signal that is not registered with
......@@ -75,11 +66,12 @@ static void sigchain_rm_special_handler_004()
remove_special_signal_handler(SIGABRT, sigchain_special_handler2);
remove_special_signal_handler(SIGABRT, sigchain_special_handler1);
remove_special_signal_handler(SIGABRT, sigchain_special_handler3);
}
int main(void)
{
sigchain_rm_special_handler_004();
raise(SIGABRT);
raise(SIGABRT);
return t_status;
}
\ No newline at end of file
......@@ -38,15 +38,6 @@ static bool sigchain_special_handler2(int signo, siginfo_t *siginfo, void *ucont
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler3(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_rm_special_handler_005", true);
return false;
}
/**
* @brief the signal handler
*/
......@@ -85,11 +76,12 @@ static void sigchain_rm_special_handler_005()
remove_special_signal_handler(SIGABRT, sigchain_special_handler2);
remove_special_signal_handler(SIGABRT, sigchain_special_handler1);
remove_special_signal_handler(SIGABRT, sigchain_special_handler3);
}
int main(void)
{
sigchain_rm_special_handler_005();
raise(SIGABRT);
raise(SIGABRT);
return t_status;
}
\ No newline at end of file
......@@ -38,15 +38,6 @@ static bool sigchain_special_handler2(int signo, siginfo_t *siginfo, void *ucont
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler3(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_rm_special_handler_006", true);
return false;
}
/**
* @brief the signal handler
*/
......@@ -88,11 +79,12 @@ static void sigchain_rm_special_handler_006()
remove_special_signal_handler(SIGABRT, sigchain_special_handler2);
remove_special_signal_handler(SIGABRT, sigchain_special_handler1);
remove_special_signal_handler(SIGABRT, sigchain_special_handler3);
}
int main(void)
{
sigchain_rm_special_handler_006();
raise(SIGABRT);
raise(SIGABRT);
return t_status;
}
\ No newline at end of file
......@@ -64,8 +64,8 @@ static void sigchain_rm_special_handler_007()
int signo[SIGCHIAN_TEST_SIGNAL_NUM_2] = {SIGCHAIN_SIGNAL_64, SIGHUP};
SIGCHAIN_TEST_SET_MASK(set, "sigchain_rm_special_handler_007", signo, SIGCHIAN_TEST_SIGNAL_NUM_2);
remove_special_signal_handler(SIGHUP, sigchain_special_handler1);
remove_special_signal_handler(SIGCHAIN_SIGNAL_64, sigchain_special_handler2);
remove_special_signal_handler(SIGHUP, sigchain_special_handler2);
remove_special_signal_handler(SIGCHAIN_SIGNAL_64, sigchain_special_handler1);
}
int main(void)
......
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <sigchain.h>
#include <wchar.h>
#include <stdlib.h>
#include "test.h"
#include "functionalext.h"
#include "sigchain_util.h"
/**
* @brief the special handler
*/
static bool sigchain_special_handler(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_rm_special_handler_013", true);
return false;
}
/**
* @brief the special handler
*/
static bool sigchain_special_handler1(int signo, siginfo_t *siginfo, void *ucontext_raw)
{
EXPECT_FALSE("sigchain_rm_special_handler_013", true);
return false;
}
/**
* @brief the signal handler
*/
static void signal_handler(int signo)
{
EXPECT_EQ("sigchain_rm_special_handler_013", signo, SIGABRT);
return;
}
/**
* @tc.name : sigchain_rm_special_handler_013
* @tc.desc : Remove the special handler with wrong signal
* @tc.level : Level 0
*/
static void sigchain_rm_special_handler_013()
{
signal(SIGABRT, signal_handler);
remove_special_signal_handler(0, sigchain_special_handler);
remove_special_signal_handler(SIGCHAIN_SIGNAL_65, sigchain_special_handler1);
}
int main(void)
{
sigchain_rm_special_handler_013();
return t_status;
}
\ No newline at end of file
......@@ -23,11 +23,11 @@ functionalext_sigchain_list = [
"sigchain_add_special_handler_j",
"sigchain_add_special_handler_k",
"sigchain_add_special_handler_l",
"sigchain_add_special_handler_m",
"sigchain_rm_special_handler_a",
"sigchain_rm_special_handler_b",
"sigchain_rm_special_handler_c",
"sigchain_rm_special_handler_d",
"sigchain_rm_special_handler_e",
"sigchain_rm_special_handler_f",
"sigchain_rm_special_handler_g",
"sigchain_rm_special_handler_h",
......@@ -35,7 +35,6 @@ functionalext_sigchain_list = [
"sigchain_rm_special_handler_j",
"sigchain_rm_special_handler_k",
"sigchain_rm_special_handler_l",
"sigchain_rm_special_handler_m",
"sigchain_intercept_sigaction_a",
"sigchain_intercept_sigaction_b",
"sigchain_intercept_sigaction_c",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册