RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00
Code Issues Activity Actions

test-js: Only parse test-common.js once

Browse source
This commit is contained in:
Matthew Olsson 2020-07-04 13:45:20 -07:00 • committed by Andreas Kling
parent a822512443
commit 38648f1758
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Userland/test-js.cpp
View file

@ -264,6 +264,8 @@ private:
double m_total_elapsed_time_in_ms { 0 }; double m_total_elapsed_time_in_ms { 0 };
JSTestRunnerCounts m_counts; JSTestRunnerCounts m_counts;
RefPtr<JS::Program> m_test_program;
}; };
void TestRunner::run() void TestRunner::run()
@ -274,12 +276,12 @@ void TestRunner::run()
print_test_results(); print_test_results();
} }
Optional<ParserError> parse_and_run_file(JS::Interpreter& interpreter, const String& path) Result<NonnullRefPtr<JS::Program>, ParserError> parse_file(const String& file_path)
{ {
auto file = Core::File::construct(path); auto file = Core::File::construct(file_path);
auto result = file->open(Core::IODevice::ReadOnly); auto result = file->open(Core::IODevice::ReadOnly);
if (!result) { if (!result) {
printf("Failed to open the following file: \"%s\"\n", path.characters()); printf("Failed to open the following file: \"%s\"\n", file_path.characters());
exit(1); exit(1);
} }
@ -292,12 +294,10 @@ Optional<ParserError> parse_and_run_file(JS::Interpreter& interpreter, const Str
if (parser.has_errors()) { if (parser.has_errors()) {
auto error = parser.errors()[0]; auto error = parser.errors()[0];
return ParserError { error, error.source_location_hint(test_file_string) }; return Result<NonnullRefPtr<JS::Program>, ParserError>(ParserError { error, error.source_location_hint(test_file_string) });
} else {
interpreter.run(interpreter.global_object(), *program);
} }
return {}; return Result<NonnullRefPtr<JS::Program>, ParserError>(program);
} }
Optional<JsonValue> get_test_results(JS::Interpreter& interpreter) Optional<JsonValue> get_test_results(JS::Interpreter& interpreter)
@ -317,14 +317,21 @@ JSFileResult TestRunner::run_file_test(const String& test_path)
double start_time = get_time(); double start_time = get_time();
auto interpreter = JS::Interpreter::create<JS::GlobalObject>(); auto interpreter = JS::Interpreter::create<JS::GlobalObject>();
if (parse_and_run_file(*interpreter, String::format("%s/test-common.js", m_test_root.characters())).has_value()) { if (!m_test_program) {
dbg() << "test-common.js failed to parse"; auto result = parse_file(String::format("%s/test-common.js", m_test_root.characters()));
exit(1); if (result.is_error()) {
printf("Unable to parse test-common.js");
exit(1);
}
m_test_program = result.value();
} }
auto source_file_result = parse_and_run_file(*interpreter, String::format("%s/%s", m_test_root.characters(), test_path.characters())); interpreter->run(interpreter->global_object(), *m_test_program);
if (source_file_result.has_value())
return { test_path, source_file_result }; auto file_program = parse_file(String::format("%s/%s", m_test_root.characters(), test_path.characters()));
if (file_program.is_error())
return { test_path, file_program.error() };
interpreter->run(interpreter->global_object(), *file_program.value());
// Print any output // Print any output
// FIXME: Should be printed to stdout in a nice format // FIXME: Should be printed to stdout in a nice format