<html>
<head>
<base href="https://bugs.freedesktop.org/">
</head>
<body>
<p>
<div>
<b><a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED NOTABUG - Test enumeration becomes funky on some tests due to fd FILE* stream change"
href="https://bugs.freedesktop.org/show_bug.cgi?id=108891#c3">Comment # 3</a>
on <a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED NOTABUG - Test enumeration becomes funky on some tests due to fd FILE* stream change"
href="https://bugs.freedesktop.org/show_bug.cgi?id=108891">bug 108891</a>
from <span class="vcard"><a class="email" href="mailto:chris@chris-wilson.co.uk" title="Chris Wilson <chris@chris-wilson.co.uk>"> <span class="fn">Chris Wilson</span></a>
</span></b>
<pre>diff --git a/lib/igt_core.c b/lib/igt_core.c
index e0989f53..bd600762 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1116,30 +1116,28 @@ void igt_fail(int exitcode)
if (in_atexit_handler)
_exit(IGT_EXIT_FAILURE);
- if (!failed_one)
- igt_exitcode = exitcode;
-
- failed_one = true;
-
/* Silent exit, parent will do the yelling. */
if (test_child)
exit(exitcode);
+ if (in_fixture) {
+ skip_subtests_henceforth = FAIL;
+ __igt_fixture_end();
+ }
+
_igt_log_buffer_dump();
+ if (!failed_one) {
+ igt_exitcode = exitcode;
+ failed_one = true;
+ }
+
if (in_subtest) {
if (exitcode == IGT_EXIT_TIMEOUT)
exit_subtest("TIMEOUT");
else
exit_subtest("FAIL");
} else {
- assert(igt_can_fail());
-
- if (in_fixture) {
- skip_subtests_henceforth = FAIL;
- __igt_fixture_end();
- }
-
igt_exit();
}
}</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are the assignee for the bug.</li>
</ul>
</body>
</html>