RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:57:45 +00:00
Code Issues Activity Actions

run-tests: Make reproducing test failures behave closer to selftest mode

Browse source 
In CI / or local testing when you run `serenity.sh tests`, the system
will boot itself in self test mode, and the test runner will be launched
by SystemServer. Previously we were setting up settings for that
environment in the `SystemServer.ini`. This makes reproducing CI
failures a bit confusing, as the system will behavior differently if you
run in self-test mode, vs running `run-tests-and-shutdown.sh` or
`run-tests` manually in a session.

This change moves the settings to `run-tests`, so no matter how you try
to run the test runner, it will always behave the same.
This commit is contained in:
Brian Gianforcaro 2022-01-05 02:17:45 -08:00 • committed by Brian Gianforcaro
parent 856fc76083
commit 6bf91d00ef
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Base/etc/SystemServer.ini
View file

@ -155,7 +155,7 @@ User=anon
[TestRunner@ttyS0] [TestRunner@ttyS0]
Executable=/home/anon/tests/run-tests-and-shutdown.sh Executable=/home/anon/tests/run-tests-and-shutdown.sh
StdIO=/dev/ttyS0 StdIO=/dev/ttyS0
Environment=DO_SHUTDOWN_AFTER_TESTS=1 TERM=xterm PATH=/bin:/usr/bin:/usr/local/bin TESTS_ONLY=1 UBSAN_OPTIONS=halt_on_error=1 Environment=DO_SHUTDOWN_AFTER_TESTS=1 TERM=xterm PATH=/bin:/usr/bin:/usr/local/bin
User=anon User=anon
WorkingDirectory=/home/anon WorkingDirectory=/home/anon
SystemModes=self-test SystemModes=self-test

10
Userland/Utilities/run-tests.cpp
View file

@ -12,6 +12,7 @@
#include <LibTest/TestRunner.h> #include <LibTest/TestRunner.h>
#include <signal.h> #include <signal.h>
#include <spawn.h> #include <spawn.h>
#include <stdlib.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
@ -255,6 +256,7 @@ FileResult TestRunner::run_test_file(const String& test_path)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
auto program_name = LexicalPath::basename(argv[0]); auto program_name = LexicalPath::basename(argv[0]);
#ifdef SIGINFO #ifdef SIGINFO
@ -274,6 +276,7 @@ int main(int argc, char** argv)
#endif #endif
bool print_json = false; bool print_json = false;
bool print_all_output = false; bool print_all_output = false;
bool run_benchmarks = false;
const char* specified_test_root = nullptr; const char* specified_test_root = nullptr;
String test_glob; String test_glob;
String exclude_pattern; String exclude_pattern;
@ -297,6 +300,7 @@ int main(int argc, char** argv)
}); });
args_parser.add_option(print_json, "Show results as JSON", "json", 'j'); args_parser.add_option(print_json, "Show results as JSON", "json", 'j');
args_parser.add_option(print_all_output, "Show all test output", "verbose", 'v'); args_parser.add_option(print_all_output, "Show all test output", "verbose", 'v');
args_parser.add_option(run_benchmarks, "Run benchmarks as well", "benchmarks", 'b');
args_parser.add_option(test_glob, "Only run tests matching the given glob", "filter", 'f', "glob"); args_parser.add_option(test_glob, "Only run tests matching the given glob", "filter", 'f', "glob");
args_parser.add_option(exclude_pattern, "Regular expression to use to exclude paths from being considered tests", "exclude-pattern", 'e', "pattern"); args_parser.add_option(exclude_pattern, "Regular expression to use to exclude paths from being considered tests", "exclude-pattern", 'e', "pattern");
args_parser.add_option(config_file, "Configuration file to use", "config-file", 'c', "filename"); args_parser.add_option(config_file, "Configuration file to use", "config-file", 'c', "filename");
@ -309,6 +313,12 @@ int main(int argc, char** argv)
AK::set_debug_enabled(false); AK::set_debug_enabled(false);
} }
// Make UBSAN deadly for all tests we run by default.
setenv("UBSAN_OPTIONS", "halt_on_error=1", true);
if (!run_benchmarks)
setenv("TESTS_ONLY", "1", true);
String test_root; String test_root;
if (specified_test_root) { if (specified_test_root) {