public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests: close(fd) without igt_fixture considered harmful
@ 2018-11-26 10:08 Daniel Vetter
  2018-11-26 12:10 ` Jani Nikula
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Daniel Vetter @ 2018-11-26 10:08 UTC (permalink / raw)
  To: IGT development; +Cc: Daniel Vetter

Some tests assume that close on an unopened fd is fine, except it's
not just unopened but actually stack garbage. There's a good chance we
end up running close(0), which wreaks the testcase enumeration. Fix
this.

Not sure there's a better way to catch this than git grep plus lots of
manual auditing ... The unit tests only catch it by accident (x86
works fine, I hit it in one testcase only cross-building to aarch64).

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 tests/i915/gem_pread_after_blit.c  | 3 ++-
 tests/i915/gem_tiled_fence_blits.c | 3 ++-
 tests/i915/gem_tiled_swapping.c    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/i915/gem_pread_after_blit.c b/tests/i915/gem_pread_after_blit.c
index 6ef3ca200776..cee9212749d6 100644
--- a/tests/i915/gem_pread_after_blit.c
+++ b/tests/i915/gem_pread_after_blit.c
@@ -248,5 +248,6 @@ igt_main
 		drm_intel_bufmgr_destroy(bufmgr);
 	}
 
-	close(fd);
+	igt_fixture
+		close(fd);
 }
diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
index c02e35a5fe4c..2453bcc0b271 100644
--- a/tests/i915/gem_tiled_fence_blits.c
+++ b/tests/i915/gem_tiled_fence_blits.c
@@ -230,5 +230,6 @@ igt_main
 		run_test(fd, count);
 	}
 
-	close(fd);
+	igt_fixture
+		close(fd);
 }
diff --git a/tests/i915/gem_tiled_swapping.c b/tests/i915/gem_tiled_swapping.c
index dce668063014..ddf2a748fc84 100644
--- a/tests/i915/gem_tiled_swapping.c
+++ b/tests/i915/gem_tiled_swapping.c
@@ -235,5 +235,6 @@ igt_main
 			thread_fini(&threads[n]);
 	}
 
-	close(fd);
+	igt_fixture
+		close(fd);
 }
-- 
2.19.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-11-26 17:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-26 10:08 [igt-dev] [PATCH i-g-t] tests: close(fd) without igt_fixture considered harmful Daniel Vetter
2018-11-26 12:10 ` Jani Nikula
2018-11-26 14:26   ` Daniel Vetter
2018-11-26 12:55 ` Petri Latvala
2018-11-26 13:41 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-11-26 17:30 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox