mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 05:17:35 +00:00
LibTest: Move Crash testing facility from crash.cpp to LibTest
This commit is contained in:
parent
9720ad3901
commit
4c0d3f47e1
5 changed files with 105 additions and 65 deletions
|
@ -2,6 +2,7 @@ serenity_install_sources("Userland/Libraries/LibTest")
|
||||||
|
|
||||||
set(SOURCES
|
set(SOURCES
|
||||||
TestSuite.cpp
|
TestSuite.cpp
|
||||||
|
CrashTest.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibTest test)
|
serenity_lib(LibTest test)
|
||||||
|
|
63
Userland/Libraries/LibTest/CrashTest.cpp
Normal file
63
Userland/Libraries/LibTest/CrashTest.cpp
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* Copyright (c) 2019-2020, Shannon Booth <shannon.ml.booth@gmail.com>
|
||||||
|
* Copyright (c) 2021, Brian Gianforcaro <bgianf@serenityos.org>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibTest/CrashTest.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
namespace Test {
|
||||||
|
|
||||||
|
Crash::Crash(String test_type, Function<Crash::Failure()> crash_function)
|
||||||
|
: m_type(test_type)
|
||||||
|
, m_crash_function(move(crash_function))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void Crash::run(RunType run_type = RunType::UsingChildProcess)
|
||||||
|
{
|
||||||
|
printf("\x1B[33mTesting\x1B[0m: \"%s\"\n", m_type.characters());
|
||||||
|
|
||||||
|
auto run_crash_and_print_if_error = [this]() {
|
||||||
|
auto failure = m_crash_function();
|
||||||
|
|
||||||
|
// If we got here something went wrong
|
||||||
|
printf("\x1B[31mFAIL\x1B[0m: ");
|
||||||
|
switch (failure) {
|
||||||
|
case Failure::DidNotCrash:
|
||||||
|
printf("Did not crash!\n");
|
||||||
|
break;
|
||||||
|
case Failure::UnexpectedError:
|
||||||
|
printf("Unexpected error!\n");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
VERIFY_NOT_REACHED();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (run_type == RunType::UsingCurrentProcess) {
|
||||||
|
run_crash_and_print_if_error();
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Run the test in a child process so that we do not crash the crash program :^)
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid < 0) {
|
||||||
|
perror("fork");
|
||||||
|
VERIFY_NOT_REACHED();
|
||||||
|
} else if (pid == 0) {
|
||||||
|
run_crash_and_print_if_error();
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int status;
|
||||||
|
waitpid(pid, &status, 0);
|
||||||
|
if (WIFSIGNALED(status))
|
||||||
|
printf("\x1B[32mPASS\x1B[0m: Terminated with signal %d\n", WTERMSIG(status));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
37
Userland/Libraries/LibTest/CrashTest.h
Normal file
37
Userland/Libraries/LibTest/CrashTest.h
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* Copyright (c) 2019-2020, Shannon Booth <shannon.ml.booth@gmail.com>
|
||||||
|
* Copyright (c) 2021, Brian Gianforaro <bgianf@serenityos.org>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/Function.h>
|
||||||
|
#include <AK/String.h>
|
||||||
|
|
||||||
|
namespace Test {
|
||||||
|
|
||||||
|
class Crash {
|
||||||
|
public:
|
||||||
|
enum class RunType {
|
||||||
|
UsingChildProcess,
|
||||||
|
UsingCurrentProcess,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class Failure {
|
||||||
|
DidNotCrash,
|
||||||
|
UnexpectedError,
|
||||||
|
};
|
||||||
|
|
||||||
|
Crash(String test_type, Function<Crash::Failure()> crash_function);
|
||||||
|
|
||||||
|
void run(RunType run_type);
|
||||||
|
|
||||||
|
private:
|
||||||
|
String m_type;
|
||||||
|
Function<Crash::Failure()> m_crash_function;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -22,6 +22,7 @@ target_link_libraries(checksum LibCrypto)
|
||||||
target_link_libraries(chres LibGUI)
|
target_link_libraries(chres LibGUI)
|
||||||
target_link_libraries(cksum LibCrypto)
|
target_link_libraries(cksum LibCrypto)
|
||||||
target_link_libraries(copy LibGUI)
|
target_link_libraries(copy LibGUI)
|
||||||
|
target_link_libraries(crash LibTest)
|
||||||
target_link_libraries(disasm LibX86)
|
target_link_libraries(disasm LibX86)
|
||||||
target_link_libraries(expr LibRegex)
|
target_link_libraries(expr LibRegex)
|
||||||
target_link_libraries(functrace LibDebug LibX86)
|
target_link_libraries(functrace LibDebug LibX86)
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <AK/String.h>
|
#include <AK/String.h>
|
||||||
#include <Kernel/IO.h>
|
#include <Kernel/IO.h>
|
||||||
#include <LibCore/ArgsParser.h>
|
#include <LibCore/ArgsParser.h>
|
||||||
|
#include <LibTest/CrashTest.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
@ -16,73 +17,10 @@
|
||||||
#include <syscall.h>
|
#include <syscall.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
using Test::Crash;
|
||||||
|
|
||||||
#pragma GCC optimize("O0")
|
#pragma GCC optimize("O0")
|
||||||
|
|
||||||
class Crash {
|
|
||||||
public:
|
|
||||||
enum class RunType {
|
|
||||||
UsingChildProcess,
|
|
||||||
UsingCurrentProcess,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class Failure {
|
|
||||||
DidNotCrash,
|
|
||||||
UnexpectedError,
|
|
||||||
};
|
|
||||||
|
|
||||||
Crash(String test_type, Function<Crash::Failure()> crash_function)
|
|
||||||
: m_type(test_type)
|
|
||||||
, m_crash_function(move(crash_function))
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void run(RunType run_type)
|
|
||||||
{
|
|
||||||
printf("\x1B[33mTesting\x1B[0m: \"%s\"\n", m_type.characters());
|
|
||||||
|
|
||||||
auto run_crash_and_print_if_error = [this]() {
|
|
||||||
auto failure = m_crash_function();
|
|
||||||
|
|
||||||
// If we got here something went wrong
|
|
||||||
printf("\x1B[31mFAIL\x1B[0m: ");
|
|
||||||
switch (failure) {
|
|
||||||
case Failure::DidNotCrash:
|
|
||||||
printf("Did not crash!\n");
|
|
||||||
break;
|
|
||||||
case Failure::UnexpectedError:
|
|
||||||
printf("Unexpected error!\n");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
VERIFY_NOT_REACHED();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (run_type == RunType::UsingCurrentProcess) {
|
|
||||||
run_crash_and_print_if_error();
|
|
||||||
} else {
|
|
||||||
|
|
||||||
// Run the test in a child process so that we do not crash the crash program :^)
|
|
||||||
pid_t pid = fork();
|
|
||||||
if (pid < 0) {
|
|
||||||
perror("fork");
|
|
||||||
VERIFY_NOT_REACHED();
|
|
||||||
} else if (pid == 0) {
|
|
||||||
run_crash_and_print_if_error();
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int status;
|
|
||||||
waitpid(pid, &status, 0);
|
|
||||||
if (WIFSIGNALED(status))
|
|
||||||
printf("\x1B[32mPASS\x1B[0m: Terminated with signal %d\n", WTERMSIG(status));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
String m_type;
|
|
||||||
Function<Crash::Failure()> m_crash_function;
|
|
||||||
};
|
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
bool do_all_crash_types = false;
|
bool do_all_crash_types = false;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue