carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 08:11:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Narrow the CRC scope in file_test (#5043)

Browse Source 
This narrows the scope of the CRC to try to get better behavior around
mutex lock releasing on crash. Closes #5042.

This breaks apart `ProcessTestFileAndRun` because we need to process the
test file for `SET-CAPTURE-CONSOLE-OUTPUT`. The test file processing
should more reliably not crash than the core `Run` logic though, so
should be reasonably safe to put outside the CRC.

Also support --threads=1 for disabling threading. This is the flipside
for me of reducing how much is in the CRC: make it easier to run on a
single thread if the CRC gets in the way of debugging. This also means a
typical copy-paste execution of a single test will be single-threaded.

---------

Co-authored-by: Geoff Romer <gromer@google.com>
This commit is contained in:
Jon Ross-Perkins
2025-02-28 21:25:15 +00:00
committed by GitHub
co-authored by Geoff Romer
parent fc5dcfe957
commit 6d6987dce4
7 changed files with 172 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/file_test/run_test.cpp
+9 -23
View File
@@ -27,7 +27,6 @@ static constexpr llvm::StringLiteral StdinFilename = "STDIN";
// Does replacements in ARGS for %s and %t.
static auto DoArgReplacements(
llvm::SmallVector<std::string>& test_args,
const llvm::StringMap<std::string>& replacements,
const llvm::SmallVector<TestFile::Split>& split_files) -> ErrorOr<Success> {
@@ -87,21 +86,15 @@ static auto DoArgReplacements(
return Success();
}
auto ProcessTestFileAndRun(FileTestBase* test_base, std::mutex* output_mutex,
bool dump_output, bool running_autoupdate)
-> ErrorOr<TestFile> {
// Load expected output.
CARBON_ASSIGN_OR_RETURN(
TestFile test_file,
ProcessTestFile(test_base->test_name(), running_autoupdate));
auto RunTestFile(const FileTestBase& test_base, bool dump_output,
TestFile& test_file) -> ErrorOr<Success> {
// Process arguments.
if (test_file.test_args.empty()) {
test_file.test_args = test_base->GetDefaultArgs();
test_file.test_args = test_base.GetDefaultArgs();
test_file.test_args.append(test_file.extra_args);
}
CARBON_RETURN_IF_ERROR(DoArgReplacements(test_file.test_args,
test_base->GetArgReplacements(),
test_base.GetArgReplacements(),
test_file.file_splits));
// stdin needs to exist on-disk for compatibility. We'll use a pointer for it.
@@ -147,13 +140,6 @@ auto ProcessTestFileAndRun(FileTestBase* test_base, std::mutex* output_mutex,
llvm::PrettyStackTraceProgram stack_trace_entry(
test_argv_for_stack_trace.size() - 1, test_argv_for_stack_trace.data());
// Execution must be serialized for either serial tests or console output.
std::unique_lock<std::mutex> output_lock;
if (output_mutex &&
(test_file.capture_console_output || !test_base->AllowParallelRun())) {
output_lock = std::unique_lock<std::mutex>(*output_mutex);
}
// Conditionally capture console output. We use a scope exit to ensure the
// captures terminate even on run failures.
if (test_file.capture_console_output) {
@@ -168,10 +154,10 @@ auto ProcessTestFileAndRun(FileTestBase* test_base, std::mutex* output_mutex,
llvm::raw_svector_ostream error_stream(test_file.actual_stderr);
ErrorOr<FileTestBase::RunResult> run_result =
dump_output ? test_base->Run(test_args_ref, fs, input_stream,
llvm::outs(), llvm::errs())
: test_base->Run(test_args_ref, fs, input_stream,
output_stream, error_stream);
dump_output ? test_base.Run(test_args_ref, fs, input_stream, llvm::outs(),
llvm::errs())
: test_base.Run(test_args_ref, fs, input_stream,
output_stream, error_stream);
// Ensure stdout/stderr are always fetched, even when discarded on error.
if (test_file.capture_console_output) {
@@ -185,7 +171,7 @@ auto ProcessTestFileAndRun(FileTestBase* test_base, std::mutex* output_mutex,
return std::move(run_result).error();
}
test_file.run_result = std::move(*run_result);
return test_file;
return Success();
}
} // namespace Carbon::Testing