Commit 0d3c8a5f authored by Arkadiusz Hiler's avatar Arkadiusz Hiler

tests: Clean up igt_skip_on_simulation() uses

General update to reflect current state of things.
Signed-off-by: Arkadiusz Hiler's avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Acked-by: Radosław's avatarRadoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Acked-by: Petri Latvala's avatarPetri Latvala <petri.latvala@intel.com>
parent 892abc60
......@@ -323,8 +323,6 @@ igt_main
{
int fd;
igt_skip_on_simulation();
igt_fixture {
fd = drm_open_driver(DRIVER_ANY);
igt_require(fd >= 0);
......
......@@ -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));
......
......@@ -209,8 +209,6 @@ static void threads(int timeout)
igt_main
{
igt_skip_on_simulation();
igt_fixture {
int fd;
......
......@@ -254,7 +254,6 @@ igt_main
run_test (fd, 10);
}
igt_skip_on_simulation();
igt_subtest("full") {
aper_size = gem_mappable_aperture_size();
......
......@@ -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
......
......@@ -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)
......
......@@ -1426,8 +1426,6 @@ igt_main
const struct intel_execution_engine *e;
int i915 = -1;
igt_skip_on_simulation();
igt_fixture {
i915 = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(i915);
......@@ -1481,6 +1479,8 @@ igt_main
igt_subtest_group {
igt_hang_t hang;
igt_skip_on_simulation();
igt_fixture {
hang = igt_allow_hang(i915, 0, 0);
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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]);
......
......@@ -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]))
......
......@@ -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);
}
......
......@@ -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();
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment