Skip to content

Commit

Permalink
Merge pull request #78216 from akien-mga/gdscript-test-no-file-path
Browse files Browse the repository at this point in the history
GDScript: Only include script file path in test error output
  • Loading branch information
akien-mga committed Jun 14, 2023
2 parents 72ee877 + c40adf0 commit 824c139
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 10 additions & 4 deletions modules/gdscript/tests/gdscript_test_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,9 @@ void GDScriptTest::error_handler(void *p_this, const char *p_function, const cha

StringBuilder builder;
builder.append(">> ");
// Only include the file path and line for script errors, otherwise the test
// outputs include arbitrary data which can change when we edit engine code.
bool include_path = false;
switch (p_type) {
case ERR_HANDLER_ERROR:
builder.append("ERROR");
Expand All @@ -401,6 +404,7 @@ void GDScriptTest::error_handler(void *p_this, const char *p_function, const cha
break;
case ERR_HANDLER_SCRIPT:
builder.append("SCRIPT ERROR");
include_path = true;
break;
case ERR_HANDLER_SHADER:
builder.append("SHADER ERROR");
Expand All @@ -413,10 +417,12 @@ void GDScriptTest::error_handler(void *p_this, const char *p_function, const cha
builder.append("\n>> on function: ");
builder.append(String::utf8(p_function));
builder.append("()\n>> ");
builder.append(String::utf8(p_file).trim_prefix(self->base_dir));
builder.append("\n>> ");
builder.append(itos(p_line));
builder.append("\n>> ");
if (include_path) {
builder.append(String::utf8(p_file).trim_prefix(self->base_dir).replace("\\", "/"));
builder.append("\n>> ");
builder.append(itos(p_line));
builder.append("\n>> ");
}
builder.append(String::utf8(p_error));
if (strlen(p_explanation) > 0) {
builder.append("\n>> ");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
GDTEST_RUNTIME_ERROR
>> ERROR
>> on function: assign()
>> core/variant/array.cpp
>> 222
>> Method/function failed.
not ok

0 comments on commit 824c139

Please sign in to comment.