IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IE TEST] Fix missing falls of HoldersTest in case of crash (#9277)

Browse Source
This commit is contained in:
Sofya Balandina
2022-01-19 12:21:42 +03:00
committed by GitHub
parent de4bd44a38
commit 6d14875387
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tests/functional/plugin/shared/include/behavior/plugin/life_time.hpp
View File

@@ -33,9 +33,6 @@ public:
void SetUp() override;
void TearDown() override;
std::string deathTestStyle;
std::vector<int> order;
std::shared_ptr<ngraph::Function> function;
std::string targetDevice;
@@ -49,11 +46,9 @@ public:
static std::string getTestCaseName(testing::TestParamInfo<std::string> obj);
void SetUp() override;
void TearDown() override;
std::shared_ptr<ngraph::Function> function;
std::string targetDevice;
std::string deathTestStyle;
};
} // namespace BehaviorTestsDefinitions

60
src/tests/functional/plugin/shared/src/behavior/plugin/life_time.cpp
View File

@@ -8,7 +8,17 @@
#include <base/behavior_test_utils.hpp>
#include "behavior/plugin/life_time.hpp"
#ifndef _WIN32
#include <signal.h>
#include <setjmp.h>
#endif
namespace BehaviorTestsDefinitions {
#ifndef _WIN32
static jmp_buf env;
#endif
std::string HoldersTest::getTestCaseName(testing::TestParamInfo<HoldersParams> obj) {
std::string targetDevice;
std::vector<int> order;
@@ -27,20 +37,22 @@ namespace BehaviorTestsDefinitions {
void HoldersTest::SetUp() {
SKIP_IF_CURRENT_TEST_IS_DISABLED();
std::tie(targetDevice, order) = this->GetParam();
deathTestStyle = ::testing::GTEST_FLAG(death_test_style);
if (deathTestStyle == "fast") {
::testing::GTEST_FLAG(death_test_style) = "threadsafe";
}
function = ngraph::builder::subgraph::makeConvPoolRelu();
}
void HoldersTest::TearDown() {
::testing::GTEST_FLAG(death_test_style) = deathTestStyle;
#ifndef _WIN32
// configure handling of crash
auto crashHandler = [](int errCode) {
std::cerr << "Unexpected application crash with code: " << errCode << std::endl;
siglongjmp(env, 1);
};
struct sigaction act;
act.sa_handler = crashHandler;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGSEGV, &act, 0);
#endif
}
#define EXPECT_NO_CRASH(_statement) \
EXPECT_EXIT(_statement; exit(0), testing::ExitedWithCode(0), "")
void release_order_test(std::vector<int> order, const std::string &deviceName,
std::shared_ptr<ngraph::Function> function) {
InferenceEngine::CNNNetwork cnnNet(function);
@@ -79,12 +91,28 @@ namespace BehaviorTestsDefinitions {
TEST_P(HoldersTest, Orders) {
// Test failed if crash happens
EXPECT_NO_CRASH(release_order_test(order, targetDevice, function));
#ifdef _WIN32
EXPECT_NO_THROW(release_order_test(order, targetDevice, function));
#else
if (sigsetjmp(env, 1) == 0) {
release_order_test(order, targetDevice, function);
} else {
IE_THROW() << "Crash happens";
}
#endif
}
TEST_P(HoldersTestImportNetwork, Orders) {
// Test failed if crash happens
EXPECT_NO_CRASH(release_order_test(order, targetDevice, function));
#ifdef _WIN32
EXPECT_NO_THROW(release_order_test(order, targetDevice, function));
#else
if (sigsetjmp(env, 1) == 0) {
release_order_test(order, targetDevice, function);
} else {
IE_THROW() << "Crash happens";
}
#endif
}
std::string HoldersTestOnImportedNetwork::getTestCaseName(testing::TestParamInfo<std::string> obj) {
@@ -94,17 +122,9 @@ namespace BehaviorTestsDefinitions {
void HoldersTestOnImportedNetwork::SetUp() {
SKIP_IF_CURRENT_TEST_IS_DISABLED();
targetDevice = this->GetParam();
deathTestStyle = ::testing::GTEST_FLAG(death_test_style);
if (deathTestStyle == "fast") {
::testing::GTEST_FLAG(death_test_style) = "threadsafe";
}
function = ngraph::builder::subgraph::makeConvPoolRelu();
}
void HoldersTestOnImportedNetwork::TearDown() {
::testing::GTEST_FLAG(death_test_style) = deathTestStyle;
}
TEST_P(HoldersTestOnImportedNetwork, CreateRequestWithCoreRemoved) {
InferenceEngine::CNNNetwork cnnNet(function);
InferenceEngine::Core core = BehaviorTestsUtils::createIECoreWithTemplate();