Skip to contentSkip to conversation

tests: Clean up igt_skip_on_simulation() uses

PATCH In review Arkadiusz Hiler 4 participants 7 messages Oct 13, 2017 – Oct 16, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tests: Clean up igt_skip_on_simulation() uses

General update to reflect current state of things.

---
 tests/core_prop_blob.c     | 2 --
 tests/gem_busy.c           | 4 ++--
 tests/gem_close_race.c     | 2 --
 tests/gem_cpu_reloc.c      | 1 -
 tests/gem_ctx_exec.c       | 4 ++--
 tests/gem_ctx_switch.c     | 3 +++
 tests/gem_exec_fence.c     | 4 ++--
 tests/gem_exec_flush.c     | 2 --
 tests/gem_exec_suspend.c   | 2 ++
 tests/gem_pread.c          | 1 -
 tests/gem_pwrite.c         | 2 --
 tests/gem_ringfill.c       | 2 ++
 tests/kms_cursor_legacy.c  | 2 --
 tests/kms_flip.c           | 1 -
 tests/kms_pipe_crc_basic.c | 4 ++--
 tests/prime_busy.c         | 7 +++++--
 tests/prime_vgem.c         | 2 --
 17 files changed, 20 insertions(+), 25 deletions(-)
tests/core_prop_blob.c +0 -2
index 6423a5a2..a7e787be 100644
@@ -323,8 +323,6 @@ igt_main
 {
 	int fd;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_ANY);
 		igt_require(fd >= 0);
tests/gem_busy.c +2 -2
index 58aa5ee5..2b88270b 100644
@@ -505,8 +505,6 @@ igt_main
 	const struct intel_execution_engine *e;
 	int fd = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(fd);
@@ -601,6 +599,7 @@ igt_main
 			igt_subtest_f("%shang-%s",
 				      e->exec_id == 0 ? "basic-" : "",
 				      e->name) {
+				igt_skip_on_simulation();
 				igt_require(gem_has_ring(fd, e->exec_id | e->flags));
 				gem_quiescent_gpu(fd);
 				basic(fd, e->exec_id | e->flags, HANG);
@@ -619,6 +618,7 @@ igt_main
 					continue;
 
 				igt_subtest_f("extended-hang-%s", e->name) {
+					igt_skip_on_simulation();
 					gem_require_ring(fd, e->exec_id | e->flags);
 					igt_require(gem_can_store_dword(fd, e->exec_id | e->flags));
 
tests/gem_close_race.c +0 -2
index 3e1eb9ee..d9a45387 100644
@@ -209,8 +209,6 @@ static void threads(int timeout)
 
 igt_main
 {
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		int fd;
 
tests/gem_cpu_reloc.c +0 -1
index e039f9a2..882c312d 100644
@@ -254,7 +254,6 @@ igt_main
 		run_test (fd, 10);
 	}
 
-	igt_skip_on_simulation();
 
 	igt_subtest("full") {
 		aper_size = gem_mappable_aperture_size();
tests/gem_ctx_exec.c +2 -2
index ad39d5ed..15937cf3 100644
@@ -154,8 +154,6 @@ int fd;
 
 igt_main
 {
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver_render(DRIVER_INTEL);
 		igt_require_gem(fd);
@@ -189,6 +187,8 @@ igt_main
 	igt_subtest("reset-pin-leak") {
 		int i;
 
+		igt_skip_on_simulation();
+
 		/*
 		 * Use an explicit context to isolate the test from
 		 * any major code changes related to the per-file
tests/gem_ctx_switch.c +3 -0
index b6ea71cf..fdd67202 100644
@@ -165,6 +165,9 @@ igt_main
 	for (e = intel_execution_engines; e->name; e++) {
 		igt_subtest_f("%s%s", e->exec_id == 0 ? "basic-" : "", e->name)
 			single(fd, light, e, 0, 1, 5);
+
+		igt_skip_on_simulation();
+
 		igt_subtest_f("%s%s-heavy", e->exec_id == 0 ? "basic-" : "", e->name)
 			single(fd, heavy, e, 0, 1, 5);
 		igt_subtest_f("%s-interruptible", e->name)
tests/gem_exec_fence.c +2 -2
index 477386b4..baeb3c9c 100644
@@ -1461,8 +1461,6 @@ igt_main
 	unsigned int caps = 0;
 	int i915 = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		i915 = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(i915);
@@ -1516,6 +1514,8 @@ igt_main
 			igt_subtest_group {
 				igt_hang_t hang;
 
+				igt_skip_on_simulation();
+
 				igt_fixture {
 					hang = igt_allow_hang(i915, 0, 0);
 				}
tests/gem_exec_flush.c +0 -2
index 803d45b6..c93eee4b 100644
@@ -576,8 +576,6 @@ igt_main
 	unsigned cpu = x86_64_features();
 	int fd = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		igt_require(igt_setup_clflush());
 		fd = drm_open_driver(DRIVER_INTEL);
tests/gem_exec_suspend.c +2 -0
index bcb0e089..bbdc6e55 100644
@@ -255,6 +255,8 @@ igt_main
 	igt_hang_t hang;
 	int fd;
 
+	igt_skip_on_simulation();
+
 	igt_fixture {
 		fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(fd);
tests/gem_pread.c +0 -1
index f4cf472c..00379580 100644
@@ -100,7 +100,6 @@ int main(int argc, char **argv)
 	}, *c;
 
 	igt_subtest_init(argc, argv);
-	igt_skip_on_simulation();
 
 	if (argc > 1 && atoi(argv[1]))
 		object_size = atoi(argv[1]);
tests/gem_pwrite.c +0 -2
index b61b4466..696bd316 100644
@@ -226,8 +226,6 @@ int main(int argc, char **argv)
 		{ -1 },
 	}, *c;
 
-	igt_skip_on_simulation();
-
 	igt_subtest_init(argc, argv);
 
 	if (argc > 1 && atoi(argv[1]))
tests/gem_ringfill.c +2 -0
index 01cbd0a9..84cd49c1 100644
@@ -378,6 +378,8 @@ igt_main
 				      e->name,
 				      m->suffix) {
 				igt_skip_on(m->flags & NEWFD && master);
+				if (m->flags & (HANG|SUSPEND|HIBERNATE))
+					igt_skip_on_simulation();
 				run_test(fd, e->exec_id | e->flags,
 					 m->flags, m->timeout);
 			}
tests/kms_cursor_legacy.c +0 -2
index fc752683..5720dbef 100644
@@ -1352,8 +1352,6 @@ igt_main
 	igt_display_t display = { .drm_fd = -1 };
 	int i;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		display.drm_fd = drm_open_driver_master(DRIVER_ANY);
 		kmstest_set_vt_graphics_mode();
tests/kms_flip.c +0 -1
index acec95f0..acf4d99d 100644
@@ -1618,7 +1618,6 @@ int main(int argc, char **argv)
 	int i;
 
 	igt_subtest_init(argc, argv);
-	igt_skip_on_simulation();
 
 	igt_fixture {
 		drm_fd = drm_open_driver_master(DRIVER_ANY);
tests/kms_pipe_crc_basic.c +2 -2
index 35adddba..eaa5e316 100644
@@ -180,8 +180,6 @@ data_t data = {0, };
 
 igt_main
 {
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 
@@ -207,6 +205,8 @@ igt_main
 	igt_subtest("bad-nb-words-3")
 		test_bad_command(&data, "pipe A none option");
 
+	igt_skip_on_simulation();
+
 	for (int i = 0; i < 3; i++) {
 		igt_subtest_f("read-crc-pipe-%c", 'A'+i)
 			test_read_crc(&data, i, 0);
tests/prime_busy.c +5 -2
index a516ab86..a82acbdb 100644
@@ -186,9 +186,14 @@ static void test_engine_mode(int fd,
 			igt_require(gem_can_store_dword(fd, e->exec_id | e->flags));
 
 			if ((flags & HANG) == 0)
+			{
 				igt_fork_hang_detector(fd);
+			}
 			else
+			{
+				igt_skip_on_simulation();
 				hang = igt_allow_hang(fd, 0, 0);
+			}
 		}
 
 		igt_subtest_f("%s%s-%s",
@@ -215,8 +220,6 @@ igt_main
 	const struct intel_execution_engine *e;
 	int fd = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(fd);
tests/prime_vgem.c +0 -2
index 0ffaee90..a5f75d88 100644
@@ -760,8 +760,6 @@ igt_main
 	int i915 = -1;
 	int vgem = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		vgem = drm_open_driver(DRIVER_VGEM);
 		igt_require(has_prime_export(vgem));
Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 tests/intel-ci: Remove fast-feedback-simulation.testlist

---
 tests/intel-ci/Makefile.am                       |  1 -
 tests/intel-ci/README                            |  7 --
 tests/intel-ci/fast-feedback-simulation.testlist | 91 ------------------------
 3 files changed, 99 deletions(-)
 delete mode 100644 tests/intel-ci/fast-feedback-simulation.testlist
tests/intel-ci/Makefile.am +0 -1
index b3aff974..a1b0439f 100644
@@ -1,6 +1,5 @@
 dist_pkgdata_DATA = \
 	fast-feedback.testlist \
-	fast-feedback-simulation.testlist \
 	meta.testlist \
 	README \
 	$(NULL)
tests/intel-ci/README +0 -7
index ad73ebb2..9c08e243 100644
@@ -35,10 +35,3 @@ test per feature.
 
 The string "basic" in a test name means the test probably belongs in
 this list.
-
-=================================
-fast-feedback-simulation.testlist
-=================================
-
-fast-feedback-simulation is a version of fast-feedback.testlist for
-simulation environments.
tests/intel-ci/fast-feedback-simulation.testlist deleted +0 -91

91 lines not on this page · raw message

Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

✗ Fi.CI.BAT: failure for series starting with [1/2] tests: Clean up igt_skip_on_simulation() uses

In reply to Arkadiusz Hiler
== Series Details ==

== Series Details ==

Series: series starting with [1/2] tests: Clean up igt_skip_on_simulation() uses
URL : https://patchwork.freedesktop.org/series/31910/
State : failure

== Summary ==

IGT patchset tested on top of latest successful build 58616272b23efce1e62a3ee0d37e13de6ffc012f igt/gem_eio: Check hang/eio recovery during suspend

with latest DRM-Tip kernel build CI_DRM_3228
b2c76c5c6dce drm-tip: 2017y-10m-13d-09h-16m-12s UTC integration manifest

No testlist changes.

Test gem_exec_reloc:

        Subgroup basic-write-gtt-active:
                pass       -> FAIL       (fi-gdg-551)
Test drv_module_reload:
        Subgroup basic-reload-inject:
                dmesg-warn -> INCOMPLETE (fi-cfl-s) fdo#103206

fdo#103206 https://bugs.freedesktop.org/show_bug.cgi?id=103206

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:464s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:474s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:391s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:576s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:287s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:523s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:531s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:539s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:528s
fi-cfl-s         total:288  pass:253  dwarn:3   dfail:0   fail:0   skip:31 
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:637s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:445s
fi-gdg-551       total:289  pass:177  dwarn:1   dfail:0   fail:2   skip:109 time:276s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:602s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:446s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:465s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:511s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:482s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:504s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:598s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:468s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:658s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:548s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:555s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:476s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:597s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:443s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_351/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.BAT: success for series starting with [1/2] tests: Clean up igt_skip_on_simulation() uses

In reply to Arkadiusz Hiler
== Series Details ==

== Series Details ==

Series: series starting with [1/2] tests: Clean up igt_skip_on_simulation() uses
URL : https://patchwork.freedesktop.org/series/31910/
State : success

== Summary ==

IGT patchset tested on top of latest successful build fb3bdfff0e90c6d8b20b6b7b3e044d19efeab38f tests/drm_read: Change tests to not require fbcon

with latest DRM-Tip kernel build CI_DRM_3239
b00e3edd1580 drm-tip: 2017y-10m-16d-08h-16m-26s UTC integration manifest

No testlist changes.

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:465s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:473s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:392s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:577s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:288s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:523s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:528s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:538s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:526s
fi-cfl-s         total:289  pass:253  dwarn:4   dfail:0   fail:0   skip:32  time:568s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:434s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:273s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:603s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:439s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:465s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:506s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:477s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:503s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:491s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:597s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:665s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:470s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:661s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:533s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:515s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:474s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:589s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:434s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_363/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by on v1 1/2
#4 lore raw
In reply to Arkadiusz Hiler
Quoted 3 lines · Arkadiusz Hiler

General update to reflect current state of things.

Series is

Quoted 304 lines
---
 tests/core_prop_blob.c     | 2 --
 tests/gem_busy.c           | 4 ++--
 tests/gem_close_race.c     | 2 --
 tests/gem_cpu_reloc.c      | 1 -
 tests/gem_ctx_exec.c       | 4 ++--
 tests/gem_ctx_switch.c     | 3 +++
 tests/gem_exec_fence.c     | 4 ++--
 tests/gem_exec_flush.c     | 2 --
 tests/gem_exec_suspend.c   | 2 ++
 tests/gem_pread.c          | 1 -
 tests/gem_pwrite.c         | 2 --
 tests/gem_ringfill.c       | 2 ++
 tests/kms_cursor_legacy.c  | 2 --
 tests/kms_flip.c           | 1 -
 tests/kms_pipe_crc_basic.c | 4 ++--
 tests/prime_busy.c         | 7 +++++--
 tests/prime_vgem.c         | 2 --
 17 files changed, 20 insertions(+), 25 deletions(-)
tests/core_prop_blob.c +0 -2
index 6423a5a2..a7e787be 100644
@@ -323,8 +323,6 @@ igt_main
 {
 	int fd;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_ANY);
 		igt_require(fd >= 0);
tests/gem_busy.c +2 -2
index 58aa5ee5..2b88270b 100644
@@ -505,8 +505,6 @@ igt_main
 	const struct intel_execution_engine *e;
 	int fd = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(fd);
@@ -601,6 +599,7 @@ igt_main
 			igt_subtest_f("%shang-%s",
 				      e->exec_id == 0 ? "basic-" : "",
 				      e->name) {
+				igt_skip_on_simulation();
 				igt_require(gem_has_ring(fd, e->exec_id | e->flags));
 				gem_quiescent_gpu(fd);
 				basic(fd, e->exec_id | e->flags, HANG);
@@ -619,6 +618,7 @@ igt_main
 					continue;
 
 				igt_subtest_f("extended-hang-%s", e->name) {
+					igt_skip_on_simulation();
 					gem_require_ring(fd, e->exec_id | e->flags);
 					igt_require(gem_can_store_dword(fd, e->exec_id | e->flags));
 
tests/gem_close_race.c +0 -2
index 3e1eb9ee..d9a45387 100644
@@ -209,8 +209,6 @@ static void threads(int timeout)
 
 igt_main
 {
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		int fd;
 
tests/gem_cpu_reloc.c +0 -1
index e039f9a2..882c312d 100644
@@ -254,7 +254,6 @@ igt_main
 		run_test (fd, 10);
 	}
 
-	igt_skip_on_simulation();
 
 	igt_subtest("full") {
 		aper_size = gem_mappable_aperture_size();
tests/gem_ctx_exec.c +2 -2
index ad39d5ed..15937cf3 100644
@@ -154,8 +154,6 @@ int fd;
 
 igt_main
 {
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver_render(DRIVER_INTEL);
 		igt_require_gem(fd);
@@ -189,6 +187,8 @@ igt_main
 	igt_subtest("reset-pin-leak") {
 		int i;
 
+		igt_skip_on_simulation();
+
 		/*
 		 * Use an explicit context to isolate the test from
 		 * any major code changes related to the per-file
tests/gem_ctx_switch.c +3 -0
index b6ea71cf..fdd67202 100644
@@ -165,6 +165,9 @@ igt_main
 	for (e = intel_execution_engines; e->name; e++) {
 		igt_subtest_f("%s%s", e->exec_id == 0 ? "basic-" : "", e->name)
 			single(fd, light, e, 0, 1, 5);
+
+		igt_skip_on_simulation();
+
 		igt_subtest_f("%s%s-heavy", e->exec_id == 0 ? "basic-" : "", e->name)
 			single(fd, heavy, e, 0, 1, 5);
 		igt_subtest_f("%s-interruptible", e->name)
tests/gem_exec_fence.c +2 -2
index 477386b4..baeb3c9c 100644
@@ -1461,8 +1461,6 @@ igt_main
 	unsigned int caps = 0;
 	int i915 = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		i915 = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(i915);
@@ -1516,6 +1514,8 @@ igt_main
 			igt_subtest_group {
 				igt_hang_t hang;
 
+				igt_skip_on_simulation();
+
 				igt_fixture {
 					hang = igt_allow_hang(i915, 0, 0);
 				}
tests/gem_exec_flush.c +0 -2
index 803d45b6..c93eee4b 100644
@@ -576,8 +576,6 @@ igt_main
 	unsigned cpu = x86_64_features();
 	int fd = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		igt_require(igt_setup_clflush());
 		fd = drm_open_driver(DRIVER_INTEL);
tests/gem_exec_suspend.c +2 -0
index bcb0e089..bbdc6e55 100644
@@ -255,6 +255,8 @@ igt_main
 	igt_hang_t hang;
 	int fd;
 
+	igt_skip_on_simulation();
+
 	igt_fixture {
 		fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(fd);
tests/gem_pread.c +0 -1
index f4cf472c..00379580 100644
@@ -100,7 +100,6 @@ int main(int argc, char **argv)
 	}, *c;
 
 	igt_subtest_init(argc, argv);
-	igt_skip_on_simulation();
 
 	if (argc > 1 && atoi(argv[1]))
 		object_size = atoi(argv[1]);
tests/gem_pwrite.c +0 -2
index b61b4466..696bd316 100644
@@ -226,8 +226,6 @@ int main(int argc, char **argv)
 		{ -1 },
 	}, *c;
 
-	igt_skip_on_simulation();
-
 	igt_subtest_init(argc, argv);
 
 	if (argc > 1 && atoi(argv[1]))
tests/gem_ringfill.c +2 -0
index 01cbd0a9..84cd49c1 100644
@@ -378,6 +378,8 @@ igt_main
 				      e->name,
 				      m->suffix) {
 				igt_skip_on(m->flags & NEWFD && master);
+				if (m->flags & (HANG|SUSPEND|HIBERNATE))
+					igt_skip_on_simulation();
 				run_test(fd, e->exec_id | e->flags,
 					 m->flags, m->timeout);
 			}
tests/kms_cursor_legacy.c +0 -2
index fc752683..5720dbef 100644
@@ -1352,8 +1352,6 @@ igt_main
 	igt_display_t display = { .drm_fd = -1 };
 	int i;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		display.drm_fd = drm_open_driver_master(DRIVER_ANY);
 		kmstest_set_vt_graphics_mode();
tests/kms_flip.c +0 -1
index acec95f0..acf4d99d 100644
@@ -1618,7 +1618,6 @@ int main(int argc, char **argv)
 	int i;
 
 	igt_subtest_init(argc, argv);
-	igt_skip_on_simulation();
 
 	igt_fixture {
 		drm_fd = drm_open_driver_master(DRIVER_ANY);
tests/kms_pipe_crc_basic.c +2 -2
index 35adddba..eaa5e316 100644
@@ -180,8 +180,6 @@ data_t data = {0, };
 
 igt_main
 {
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 
@@ -207,6 +205,8 @@ igt_main
 	igt_subtest("bad-nb-words-3")
 		test_bad_command(&data, "pipe A none option");
 
+	igt_skip_on_simulation();
+
 	for (int i = 0; i < 3; i++) {
 		igt_subtest_f("read-crc-pipe-%c", 'A'+i)
 			test_read_crc(&data, i, 0);
tests/prime_busy.c +5 -2
index a516ab86..a82acbdb 100644
@@ -186,9 +186,14 @@ static void test_engine_mode(int fd,
 			igt_require(gem_can_store_dword(fd, e->exec_id | e->flags));
 
 			if ((flags & HANG) == 0)
+			{
 				igt_fork_hang_detector(fd);
+			}
 			else
+			{
+				igt_skip_on_simulation();
 				hang = igt_allow_hang(fd, 0, 0);
+			}
 		}
 
 		igt_subtest_f("%s%s-%s",
@@ -215,8 +220,6 @@ igt_main
 	const struct intel_execution_engine *e;
 	int fd = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		fd = drm_open_driver_master(DRIVER_INTEL);
 		igt_require_gem(fd);
tests/prime_vgem.c +0 -2
index 0ffaee90..a5f75d88 100644
@@ -760,8 +760,6 @@ igt_main
 	int i915 = -1;
 	int vgem = -1;
 
-	igt_skip_on_simulation();
-
 	igt_fixture {
 		vgem = drm_open_driver(DRIVER_VGEM);
 		igt_require(has_prime_export(vgem));
Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

✓ Fi.CI.IGT: success for series starting with [1/2] tests: Clean up igt_skip_on_simulation() uses

In reply to Arkadiusz Hiler
== Series Details ==

== Series Details ==

Series: series starting with [1/2] tests: Clean up igt_skip_on_simulation() uses
URL : https://patchwork.freedesktop.org/series/31910/
State : success

== Summary ==

Test kms_setmode:

        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912

fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

shard-hsw total:2553 pass:1442 dwarn:0 dfail:0 fail:8 skip:1103 time:9717s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_363/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx