Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve handling of NEO_<x>_DISABLE_TEST_ALARM

Browse Source 
Move env variable check to setAlarm function. This will help in
disabling test alarm across all test binaries.

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2022-09-21 17:30:22 +00:00
committed by Compute-Runtime-Automation
parent 7dc36ca422
commit 3e01915e61
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
level_zero/core/test/unit_tests/main.cpp
View File

@ -175,14 +175,6 @@ int main(int argc, char **argv) {
applyWorkarounds();
{
std::string envVar = std::string("NEO_") + executionName + "_DISABLE_TEST_ALARM";
char *envValue = getenv(envVar.c_str());
if (envValue != nullptr) {
enableAlarm = false;
}
}
testing::InitGoogleMock(&argc, argv);
NEO::HardwareInfo hwInfoForTests = NEO::DEFAULT_TEST_PLATFORM::hwInfo;

8
opencl/test/unit_test/main.cpp
View File

@ -168,14 +168,6 @@ int main(int argc, char **argv) {
}
#endif
{
std::string envVar = std::string("NEO_") + executionName + "_DISABLE_TEST_ALARM";
char *envValue = getenv(envVar.c_str());
if (envValue != nullptr) {
enableAlarm = false;
}
}
::testing::InitGoogleTest(&argc, argv);
HardwareInfo hwInfoForTests = DEFAULT_TEST_PLATFORM::hwInfo;

17
shared/test/common/os_interface/linux/signal_utils.cpp
View File

@ -16,7 +16,8 @@ std::string lastTest("");
namespace NEO {
extern const unsigned int ultIterationMaxTime;
}
extern const char *executionName;
} // namespace NEO
int newStdOut = -1;
@ -25,7 +26,7 @@ void handleSIGABRT(int signal) {
if (newStdOut != -1) {
dup2(newStdOut, 1);
}
std::cout << "SIGABRT on: " << lastTest << std::endl;
std::cout << "SIGABRT in " << NEO::executionName << ", on: " << lastTest << std::endl;
if (sigaction(SIGABRT, &oldSigAbrt, nullptr) == -1) {
std::cout << "FATAL: cannot fatal SIGABRT handler" << std::endl;
std::cout << "FATAL: try SEGV" << std::endl;
@ -43,7 +44,7 @@ void handleSIGALRM(int signal) {
if (newStdOut != -1) {
dup2(newStdOut, 1);
}
std::cout << "Tests timeout: ";
std::cout << "Tests timeout in " << NEO::executionName << ", ";
if (clock_gettime(CLOCK_MONOTONIC_RAW, &alrmTimeSpec) == 0) {
auto deltaSec = alrmTimeSpec.tv_sec - startTimeSpec.tv_sec;
std::cout << " after: " << deltaSec << " seconds";
@ -56,7 +57,7 @@ void handleSIGSEGV(int signal) {
if (newStdOut != -1) {
dup2(newStdOut, 1);
}
std::cout << "SIGSEGV on: " << lastTest << std::endl;
std::cout << "SIGSEGV in " << NEO::executionName << ", on: " << lastTest << std::endl;
abort();
}
@ -78,6 +79,14 @@ int setAbrt(bool enableAbrt) {
int setAlarm(bool enableAlarm) {
std::cout << "enable SIGALRM handler: " << enableAlarm << std::endl;
if (enableAlarm) {
std::string envVar = std::string("NEO_") + NEO::executionName + "_DISABLE_TEST_ALARM";
char *envValue = getenv(envVar.c_str());
if (envValue != nullptr) {
enableAlarm = false;
std::cout << "WARNING: SIGALRM handler disabled by environment variable: " << envVar << std::endl;
}
}
if (enableAlarm) {
if (clock_gettime(CLOCK_MONOTONIC_RAW, &startTimeSpec)) {
startTimeSpec.tv_sec = 0;