From 5fa15f79d00ba4f51f35cb83cf2e82a9460b60b2 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Mon, 29 Apr 2013 18:40:39 +0100 Subject: tests: Black list tests we don't want to run on simulation Let's start by a small set of tests, to eventually consider running more. The current list should then be: gem_mmap gem_pread_after_blit gem_ring_sync_loop gem_ctx_basic gem_pipe_control_store_loop gem_storedw_loop_render gem_storedw_loop_blt gem_storedw_loop_bsd gem_render_linear_blits gem_tiled_blits gem_cpu_reloc gem_exec_nop gem_mmap_gtt v2 add (Daniel Vetter) gem_exec_bad_domains gem_exec_faulting_reloc gem_flink gem_reg_read gem_reloc_overflow gem_tiling_max_stride prime_* Signed-off-by: Damien Lespiau --- tests/drm_lib.sh | 7 +++++++ tests/drm_vma_limiter.c | 2 ++ tests/drm_vma_limiter_cached.c | 2 ++ tests/drm_vma_limiter_cpu.c | 2 ++ tests/drm_vma_limiter_gtt.c | 2 ++ tests/gem_bad_length.c | 2 ++ tests/gem_cacheing.c | 1 + tests/gem_cpu_concurrent_blit.c | 1 + tests/gem_cs_prefetch.c | 2 ++ tests/gem_cs_tlb.c | 1 + tests/gem_ctx_bad_destroy.c | 2 ++ tests/gem_ctx_bad_exec.c | 3 +++ tests/gem_ctx_create.c | 2 ++ tests/gem_ctx_exec.c | 3 +++ tests/gem_double_irq_loop.c | 2 ++ tests/gem_dummy_reloc_loop.c | 1 + tests/gem_exec_big.c | 2 ++ tests/gem_exec_blt.c | 2 ++ tests/gem_exec_lut_handle.c | 2 ++ tests/gem_fence_thrash.c | 1 + tests/gem_fenced_exec_thrash.c | 12 +++++++++--- tests/gem_gtt_concurrent_blit.c | 1 + tests/gem_gtt_cpu_tlb.c | 2 ++ tests/gem_gtt_speed.c | 2 ++ tests/gem_hangcheck_forcewake.c | 2 ++ tests/gem_largeobject.c | 2 ++ tests/gem_linear_blits.c | 2 ++ tests/gem_lut_handle.c | 2 ++ tests/gem_mmap_offset_exhaustion.c | 2 ++ tests/gem_partial_pwrite_pread.c | 1 + tests/gem_pin.c | 2 ++ tests/gem_pwrite.c | 2 ++ tests/gem_readwrite.c | 2 ++ tests/gem_reloc_vs_gpu.c | 2 ++ tests/gem_render_tiled_blits.c | 2 ++ tests/gem_ringfill.c | 1 + tests/gem_seqno_wrap.c | 2 ++ tests/gem_set_tiling_vs_blt.c | 1 + tests/gem_set_tiling_vs_gtt.c | 2 ++ tests/gem_set_tiling_vs_pwrite.c | 2 ++ tests/gem_storedw_batches_loop.c | 2 ++ tests/gem_threaded_access_tiled.c | 2 ++ tests/gem_tiled_fence_blits.c | 2 ++ tests/gem_tiled_partial_pwrite_pread.c | 1 + tests/gem_tiled_pread.c | 2 ++ tests/gem_tiled_pread_pwrite.c | 1 + tests/gem_tiled_swapping.c | 2 ++ tests/gem_unfence_active_buffers.c | 2 ++ tests/gem_unref_active_buffers.c | 2 ++ tests/gem_vmap_blits.c | 2 ++ tests/gem_wait_render_timeout.c | 2 ++ tests/gem_write_read_ring_switch.c | 1 + tests/kms_flip.c | 1 + tests/kms_render.c | 1 + tests/prime_udl.c | 3 +++ tests/sysfs_edid_timing | 2 ++ tests/sysfs_rc6_residency.c | 2 ++ tests/sysfs_rps.c | 2 ++ tests/testdisplay.c | 2 ++ 59 files changed, 119 insertions(+), 3 deletions(-) diff --git a/tests/drm_lib.sh b/tests/drm_lib.sh index 5ca815b6..25323527 100755 --- a/tests/drm_lib.sh +++ b/tests/drm_lib.sh @@ -37,3 +37,10 @@ if [ -d /sys/class/drm ] ; then fi fi # sysfs may not exist as the 'error' is a new interface in 3.11 + +function drmtest_skip_on_simulation() +{ + [ -n "$INTEL_SIMULATION" ] && exit 77 +} + +drmtest_skip_on_simulation diff --git a/tests/drm_vma_limiter.c b/tests/drm_vma_limiter.c index 1971e2dc..e5025ef1 100644 --- a/tests/drm_vma_limiter.c +++ b/tests/drm_vma_limiter.c @@ -60,6 +60,8 @@ int main(int argc, char **argv) int i; char *ptr; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/drm_vma_limiter_cached.c b/tests/drm_vma_limiter_cached.c index 37976185..11447964 100644 --- a/tests/drm_vma_limiter_cached.c +++ b/tests/drm_vma_limiter_cached.c @@ -61,6 +61,8 @@ int main(int argc, char **argv) char *ptr; drm_intel_bo *load_bo; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/drm_vma_limiter_cpu.c b/tests/drm_vma_limiter_cpu.c index 24ce188e..6f65cdbd 100644 --- a/tests/drm_vma_limiter_cpu.c +++ b/tests/drm_vma_limiter_cpu.c @@ -61,6 +61,8 @@ int main(int argc, char **argv) int i; char *ptr; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/drm_vma_limiter_gtt.c b/tests/drm_vma_limiter_gtt.c index 540ea917..7e43fca9 100644 --- a/tests/drm_vma_limiter_gtt.c +++ b/tests/drm_vma_limiter_gtt.c @@ -62,6 +62,8 @@ int main(int argc, char **argv) int i; char *ptr; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/gem_bad_length.c b/tests/gem_bad_length.c index 0f2268f2..bb8b6b86 100644 --- a/tests/gem_bad_length.c +++ b/tests/gem_bad_length.c @@ -124,6 +124,8 @@ int main(int argc, char **argv) { int fd; + drmtest_skip_on_simulation(); + fd = drm_open_any(); create0(fd); diff --git a/tests/gem_cacheing.c b/tests/gem_cacheing.c index 93983a2d..8a169f1d 100644 --- a/tests/gem_cacheing.c +++ b/tests/gem_cacheing.c @@ -113,6 +113,7 @@ int main(int argc, char **argv) bool skipped_all = true; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); srandom(0xdeadbeef); diff --git a/tests/gem_cpu_concurrent_blit.c b/tests/gem_cpu_concurrent_blit.c index d5012cf6..e6cc50bb 100644 --- a/tests/gem_cpu_concurrent_blit.c +++ b/tests/gem_cpu_concurrent_blit.c @@ -96,6 +96,7 @@ main(int argc, char **argv) int i, loop, fd; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); diff --git a/tests/gem_cs_prefetch.c b/tests/gem_cs_prefetch.c index 9ef35eb9..3b058636 100644 --- a/tests/gem_cs_prefetch.c +++ b/tests/gem_cs_prefetch.c @@ -96,6 +96,8 @@ int main(int argc, char **argv) int count; drm_intel_bo *sample_batch_bo; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/gem_cs_tlb.c b/tests/gem_cs_tlb.c index 9f8f7623..05e78c23 100644 --- a/tests/gem_cs_tlb.c +++ b/tests/gem_cs_tlb.c @@ -152,6 +152,7 @@ int main(int argc, char **argv) uint32_t devid; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); devid = intel_get_drm_devid(fd); diff --git a/tests/gem_ctx_bad_destroy.c b/tests/gem_ctx_bad_destroy.c index 02d24eb3..855cd042 100644 --- a/tests/gem_ctx_bad_destroy.c +++ b/tests/gem_ctx_bad_destroy.c @@ -80,6 +80,8 @@ int main(int argc, char *argv[]) uint32_t ctx_id; int ret, fd; + drmtest_skip_on_simulation(); + fd = drm_open_any(); ctx_id = context_create(fd); diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c index 8a57fd41..f6463aca 100644 --- a/tests/gem_ctx_bad_exec.c +++ b/tests/gem_ctx_bad_exec.c @@ -111,6 +111,9 @@ int main(int argc, char *argv[]) uint32_t batch[2] = {MI_BATCH_BUFFER_END}; uint32_t ctx_id; int fd; + + drmtest_skip_on_simulation(); + fd = drm_open_any(); ctx_id = context_create(fd); diff --git a/tests/gem_ctx_create.c b/tests/gem_ctx_create.c index 84ef214a..96019767 100644 --- a/tests/gem_ctx_create.c +++ b/tests/gem_ctx_create.c @@ -42,6 +42,8 @@ int main(int argc, char *argv[]) int ret, fd; struct local_drm_i915_gem_context_create create; + drmtest_skip_on_simulation(); + create.ctx_id = rand(); create.pad = rand(); diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c index b0362cce..84681103 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -122,6 +122,9 @@ int main(int argc, char *argv[]) uint32_t batch[2] = {0, MI_BATCH_BUFFER_END}; uint32_t ctx_id; int fd; + + drmtest_skip_on_simulation(); + fd = drm_open_any(); ctx_id = context_create(fd); diff --git a/tests/gem_double_irq_loop.c b/tests/gem_double_irq_loop.c index f2f8b1a8..5e259541 100644 --- a/tests/gem_double_irq_loop.c +++ b/tests/gem_double_irq_loop.c @@ -98,6 +98,8 @@ int main(int argc, char **argv) int fd; int devid; + drmtest_skip_on_simulation(); + if (argc != 1) { fprintf(stderr, "usage: %s\n", argv[0]); exit(-1); diff --git a/tests/gem_dummy_reloc_loop.c b/tests/gem_dummy_reloc_loop.c index 1347d40c..b889f835 100644 --- a/tests/gem_dummy_reloc_loop.c +++ b/tests/gem_dummy_reloc_loop.c @@ -131,6 +131,7 @@ int main(int argc, char **argv) int num_rings; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); devid = intel_get_drm_devid(fd); diff --git a/tests/gem_exec_big.c b/tests/gem_exec_big.c index 3005762c..9dddfac5 100644 --- a/tests/gem_exec_big.c +++ b/tests/gem_exec_big.c @@ -108,6 +108,8 @@ int main(int argc, char **argv) uint32_t reloc_ofs; unsigned batch_size; + drmtest_skip_on_simulation(); + fd = drm_open_any(); for (batch_size = BATCH_SIZE/4; batch_size <= BATCH_SIZE; batch_size += 4096) { diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c index eb5ae668..e28c2e66 100644 --- a/tests/gem_exec_blt.c +++ b/tests/gem_exec_blt.c @@ -250,6 +250,8 @@ int main(int argc, char **argv) { int i; + drmtest_skip_on_simulation(); + if (argc > 1) { for (i = 1; i < argc; i++) { int object_size = atoi(argv[i]); diff --git a/tests/gem_exec_lut_handle.c b/tests/gem_exec_lut_handle.c index 4f544ad1..54ed3ddc 100644 --- a/tests/gem_exec_lut_handle.c +++ b/tests/gem_exec_lut_handle.c @@ -127,6 +127,8 @@ int main(int argc, char **argv) { .name = NULL }, }, *p; + drmtest_skip_on_simulation(); + fd = drm_open_any(); for (n = 0; n < MAX_NUM_EXEC; n++) { diff --git a/tests/gem_fence_thrash.c b/tests/gem_fence_thrash.c index e1cfc4e1..a28c1274 100644 --- a/tests/gem_fence_thrash.c +++ b/tests/gem_fence_thrash.c @@ -208,6 +208,7 @@ int main(int argc, char **argv) { drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); if (drmtest_run_subtest("bo-write-verify-none")) assert (run_test(0, bo_write_verify, I915_TILING_NONE, 80) == 0); diff --git a/tests/gem_fenced_exec_thrash.c b/tests/gem_fenced_exec_thrash.c index c8a2c58a..ebc21214 100644 --- a/tests/gem_fenced_exec_thrash.c +++ b/tests/gem_fenced_exec_thrash.c @@ -159,9 +159,15 @@ static void run_test(int fd, int num_fences, int expected_errno) int main(int argc, char **argv) { - int fd = drm_open_any(); - int num_fences = get_num_fences(fd); - uint32_t devid = intel_get_drm_devid(fd); + int fd; + int num_fences; + uint32_t devid; + + drmtest_skip_on_simulation(); + + fd = drm_open_any(); + num_fences = get_num_fences(fd); + devid = intel_get_drm_devid(fd); assert(num_fences <= MAX_FENCES); diff --git a/tests/gem_gtt_concurrent_blit.c b/tests/gem_gtt_concurrent_blit.c index 83e5f049..b3ac0b49 100644 --- a/tests/gem_gtt_concurrent_blit.c +++ b/tests/gem_gtt_concurrent_blit.c @@ -99,6 +99,7 @@ main(int argc, char **argv) int fd, loop, i; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); diff --git a/tests/gem_gtt_cpu_tlb.c b/tests/gem_gtt_cpu_tlb.c index 68533709..d324aee6 100644 --- a/tests/gem_gtt_cpu_tlb.c +++ b/tests/gem_gtt_cpu_tlb.c @@ -77,6 +77,8 @@ main(int argc, char **argv) uint32_t *ptr; + drmtest_skip_on_simulation(); + fd = drm_open_any(); handle = gem_create(fd, OBJ_SIZE); diff --git a/tests/gem_gtt_speed.c b/tests/gem_gtt_speed.c index f0fb901b..8b318d32 100644 --- a/tests/gem_gtt_speed.c +++ b/tests/gem_gtt_speed.c @@ -61,6 +61,8 @@ int main(int argc, char **argv) int loop, i, tiling; int fd; + drmtest_skip_on_simulation(); + if (argc > 1) size = atoi(argv[1]); if (size == 0) { diff --git a/tests/gem_hangcheck_forcewake.c b/tests/gem_hangcheck_forcewake.c index 96a30fef..4e6358b4 100644 --- a/tests/gem_hangcheck_forcewake.c +++ b/tests/gem_hangcheck_forcewake.c @@ -65,6 +65,8 @@ int main(int argc, char **argv) unsigned long pitch, act_size; int fd, i, devid; + drmtest_skip_on_simulation(); + memset(blob, 'A', sizeof(blob)); fd = drm_open_any(); diff --git a/tests/gem_largeobject.c b/tests/gem_largeobject.c index 163bf101..a14cc04b 100644 --- a/tests/gem_largeobject.c +++ b/tests/gem_largeobject.c @@ -87,6 +87,8 @@ int main(int argc, char **argv) { int fd; + drmtest_skip_on_simulation(); + fd = drm_open_any(); test_large_object(fd); diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c index 321c7274..0956fd08 100644 --- a/tests/gem_linear_blits.c +++ b/tests/gem_linear_blits.c @@ -240,6 +240,8 @@ int main(int argc, char **argv) { int fd, count = 0; + drmtest_skip_on_simulation(); + drmtest_subtest_init(argc, argv); fd = drm_open_any(); diff --git a/tests/gem_lut_handle.c b/tests/gem_lut_handle.c index 339e7632..fdd2ab87 100644 --- a/tests/gem_lut_handle.c +++ b/tests/gem_lut_handle.c @@ -183,6 +183,8 @@ int main(int argc, char **argv) uint32_t handle; int fd, i; + drmtest_skip_on_simulation(); + fd = drm_open_any(); handle = gem_create(fd, 4096); diff --git a/tests/gem_mmap_offset_exhaustion.c b/tests/gem_mmap_offset_exhaustion.c index 51ae5990..3c026bbe 100644 --- a/tests/gem_mmap_offset_exhaustion.c +++ b/tests/gem_mmap_offset_exhaustion.c @@ -83,6 +83,8 @@ int main(int argc, char **argv) { int fd, i; + drmtest_skip_on_simulation(); + fd = drm_open_any(); /* we have 32bit of address space, so try to fit one MB more diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c index f6fbdbff..2ca0ece0 100644 --- a/tests/gem_partial_pwrite_pread.c +++ b/tests/gem_partial_pwrite_pread.c @@ -258,6 +258,7 @@ int main(int argc, char **argv) srandom(0xdeadbeef); drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); diff --git a/tests/gem_pin.c b/tests/gem_pin.c index edf5e608..cbb1fe75 100644 --- a/tests/gem_pin.c +++ b/tests/gem_pin.c @@ -203,6 +203,8 @@ int main(int argc, char **argv) uint32_t *handle, *offset; int fd, i; + drmtest_skip_on_simulation(); + fd = drm_open_any(); if (!test_can_pin(fd)) diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c index 051ed3b5..45a7e63f 100644 --- a/tests/gem_pwrite.c +++ b/tests/gem_pwrite.c @@ -91,6 +91,8 @@ int main(int argc, char **argv) uint32_t *src, dst; int fd, count; + drmtest_skip_on_simulation(); + if (argc > 1) object_size = atoi(argv[1]); if (object_size == 0) diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c index d3d69e30..a4a4d9cc 100644 --- a/tests/gem_readwrite.c +++ b/tests/gem_readwrite.c @@ -82,6 +82,8 @@ int main(int argc, char **argv) int ret; int handle; + drmtest_skip_on_simulation(); + fd = drm_open_any(); handle = gem_create(fd, OBJECT_SIZE); diff --git a/tests/gem_reloc_vs_gpu.c b/tests/gem_reloc_vs_gpu.c index 47681d51..0c943aab 100644 --- a/tests/gem_reloc_vs_gpu.c +++ b/tests/gem_reloc_vs_gpu.c @@ -148,6 +148,8 @@ int main(int argc, char **argv) int fd, i, ring; uint32_t test; + drmtest_skip_on_simulation(); + memset(blob, 'A', sizeof(blob)); fd = drm_open_any(); diff --git a/tests/gem_render_tiled_blits.c b/tests/gem_render_tiled_blits.c index 626e652e..ed21c24d 100644 --- a/tests/gem_render_tiled_blits.c +++ b/tests/gem_render_tiled_blits.c @@ -71,6 +71,8 @@ int main(int argc, char **argv) uint32_t start = 0; int i, j, fd, count; + drmtest_skip_on_simulation(); + fd = drm_open_any(); render_copy = get_render_copyfunc(intel_get_drm_devid(fd)); diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c index 948630b9..db842fe6 100644 --- a/tests/gem_ringfill.c +++ b/tests/gem_ringfill.c @@ -206,6 +206,7 @@ int main(int argc, char **argv) int fd, fails = 0; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c index 776dedc9..f354a529 100644 --- a/tests/gem_seqno_wrap.c +++ b/tests/gem_seqno_wrap.c @@ -647,6 +647,8 @@ int main(int argc, char **argv) int wcount = 0; int r = -1; + drmtest_skip_on_simulation(); + parse_options(argc, argv); card_index = drm_get_card(0); diff --git a/tests/gem_set_tiling_vs_blt.c b/tests/gem_set_tiling_vs_blt.c index 69dc7e64..398a227e 100644 --- a/tests/gem_set_tiling_vs_blt.c +++ b/tests/gem_set_tiling_vs_blt.c @@ -234,6 +234,7 @@ int main(int argc, char **argv) uint32_t tiling, tiling_after; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); for (i = 0; i < 1024*256; i++) data[i] = i; diff --git a/tests/gem_set_tiling_vs_gtt.c b/tests/gem_set_tiling_vs_gtt.c index 1241b54d..4065ff45 100644 --- a/tests/gem_set_tiling_vs_gtt.c +++ b/tests/gem_set_tiling_vs_gtt.c @@ -58,6 +58,8 @@ int main(int argc, char **argv) bool tiling_changed; int tile_height; + drmtest_skip_on_simulation(); + fd = drm_open_any(); if (IS_GEN2(intel_get_drm_devid(fd))) diff --git a/tests/gem_set_tiling_vs_pwrite.c b/tests/gem_set_tiling_vs_pwrite.c index 35ec5cdc..77f44629 100644 --- a/tests/gem_set_tiling_vs_pwrite.c +++ b/tests/gem_set_tiling_vs_pwrite.c @@ -56,6 +56,8 @@ int main(int argc, char **argv) int i; uint32_t handle; + drmtest_skip_on_simulation(); + fd = drm_open_any(); for (i = 0; i < OBJECT_SIZE/4; i++) diff --git a/tests/gem_storedw_batches_loop.c b/tests/gem_storedw_batches_loop.c index 86c3469d..79eebb27 100644 --- a/tests/gem_storedw_batches_loop.c +++ b/tests/gem_storedw_batches_loop.c @@ -137,6 +137,8 @@ int main(int argc, char **argv) int fd; int devid; + drmtest_skip_on_simulation(); + if (argc != 1) { fprintf(stderr, "usage: %s\n", argv[0]); exit(-1); diff --git a/tests/gem_threaded_access_tiled.c b/tests/gem_threaded_access_tiled.c index 362cf3ad..48a6f62f 100644 --- a/tests/gem_threaded_access_tiled.c +++ b/tests/gem_threaded_access_tiled.c @@ -95,6 +95,8 @@ int main(int argc, char **argv) unsigned long pitch = 0; int r; + drmtest_skip_on_simulation(); + fd = drm_open_any(); assert(fd >= 0); diff --git a/tests/gem_tiled_fence_blits.c b/tests/gem_tiled_fence_blits.c index dc654793..2b02943f 100644 --- a/tests/gem_tiled_fence_blits.c +++ b/tests/gem_tiled_fence_blits.c @@ -108,6 +108,8 @@ int main(int argc, char **argv) uint32_t start = 0; int fd, i, count; + drmtest_skip_on_simulation(); + fd = drm_open_any(); count = 3 * gem_aperture_size(fd) / (1024*1024) / 2; if (count > intel_get_total_ram_mb() * 9 / 10) { diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c index f6df5622..48fd506f 100644 --- a/tests/gem_tiled_partial_pwrite_pread.c +++ b/tests/gem_tiled_partial_pwrite_pread.c @@ -277,6 +277,7 @@ int main(int argc, char **argv) uint32_t tiling_mode = I915_TILING_X; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); srandom(0xdeadbeef); diff --git a/tests/gem_tiled_pread.c b/tests/gem_tiled_pread.c index 189affce..779f66f3 100644 --- a/tests/gem_tiled_pread.c +++ b/tests/gem_tiled_pread.c @@ -134,6 +134,8 @@ main(int argc, char **argv) uint32_t handle; uint32_t devid; + drmtest_skip_on_simulation(); + fd = drm_open_any(); handle = create_bo(fd); diff --git a/tests/gem_tiled_pread_pwrite.c b/tests/gem_tiled_pread_pwrite.c index ed6b7119..0eb70982 100644 --- a/tests/gem_tiled_pread_pwrite.c +++ b/tests/gem_tiled_pread_pwrite.c @@ -123,6 +123,7 @@ main(int argc, char **argv) uint32_t handle, handle_target; int count; + drmtest_skip_on_simulation(); fd = drm_open_any(); count = intel_get_total_ram_mb() * 9 / 10; diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c index 14f5f401..702cb741 100644 --- a/tests/gem_tiled_swapping.c +++ b/tests/gem_tiled_swapping.c @@ -101,6 +101,8 @@ main(int argc, char **argv) int count; current_tiling_mode = I915_TILING_X; + drmtest_skip_on_simulation(); + fd = drm_open_any(); /* need slightly more than total ram */ count = intel_get_total_ram_mb() * 11 / 10; diff --git a/tests/gem_unfence_active_buffers.c b/tests/gem_unfence_active_buffers.c index bffc62ea..3f6a0534 100644 --- a/tests/gem_unfence_active_buffers.c +++ b/tests/gem_unfence_active_buffers.c @@ -70,6 +70,8 @@ int main(int argc, char **argv) drm_intel_bo *busy_bo, *test_bo; uint32_t tiling = I915_TILING_X; + drmtest_skip_on_simulation(); + for (i = 0; i < 1024*256; i++) data[i] = i; diff --git a/tests/gem_unref_active_buffers.c b/tests/gem_unref_active_buffers.c index aa29c1de..8a13a209 100644 --- a/tests/gem_unref_active_buffers.c +++ b/tests/gem_unref_active_buffers.c @@ -56,6 +56,8 @@ int main(int argc, char **argv) { int fd, i; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c index b8868214..5e1c1706 100644 --- a/tests/gem_vmap_blits.c +++ b/tests/gem_vmap_blits.c @@ -262,6 +262,8 @@ int main(int argc, char **argv) uint32_t start = 0; int i, fd, count; + drmtest_skip_on_simulation(); + fd = drm_open_any(); if (!has_vmap(fd)) { diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait_render_timeout.c index 14482e37..ed30e5c1 100644 --- a/tests/gem_wait_render_timeout.c +++ b/tests/gem_wait_render_timeout.c @@ -122,6 +122,8 @@ int main(int argc, char **argv) bool done = false; int i, iter = 1; + drmtest_skip_on_simulation(); + fd = drm_open_any(); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/gem_write_read_ring_switch.c b/tests/gem_write_read_ring_switch.c index b7fedc6f..162c0594 100644 --- a/tests/gem_write_read_ring_switch.c +++ b/tests/gem_write_read_ring_switch.c @@ -174,6 +174,7 @@ int main(int argc, char **argv) int i; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); fd = drm_open_any(); diff --git a/tests/kms_flip.c b/tests/kms_flip.c index e1f2864f..9e0d2350 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1171,6 +1171,7 @@ int main(int argc, char **argv) int i; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); drm_fd = drm_open_any(); diff --git a/tests/kms_render.c b/tests/kms_render.c index 3867a0b8..72bae2f4 100644 --- a/tests/kms_render.c +++ b/tests/kms_render.c @@ -225,6 +225,7 @@ int main(int argc, char **argv) int i; drmtest_subtest_init(argc, argv); + drmtest_skip_on_simulation(); if (!drmtest_only_list_subtests()) { drm_fd = drm_open_any(); diff --git a/tests/prime_udl.c b/tests/prime_udl.c index 81670c4d..8e470037 100644 --- a/tests/prime_udl.c +++ b/tests/prime_udl.c @@ -29,6 +29,7 @@ #include "intel_bufmgr.h" #include "intel_gpu_tools.h" #include "intel_batchbuffer.h" +#include "drmtest.h" int intel_fd = -1, udl_fd = -1; drm_intel_bufmgr *bufmgr; @@ -150,6 +151,8 @@ int main(int argc, char **argv) { int ret; + drmtest_skip_on_simulation(); + ret = find_and_open_devices(); if (ret < 0) return ret; diff --git a/tests/sysfs_edid_timing b/tests/sysfs_edid_timing index 3a8c6c0e..2a43cca4 100755 --- a/tests/sysfs_edid_timing +++ b/tests/sysfs_edid_timing @@ -5,6 +5,8 @@ # we sometimes take a *really* long time. So let's just check for some reasonable timing here # +[ -n "$INTEL_SIMULATION" ] && exit 77 + TIME1=$(date +%s%N) cat $(find /sys/devices/|grep drm | grep /status) > /dev/null TIME2=$(date +%s%N) diff --git a/tests/sysfs_rc6_residency.c b/tests/sysfs_rc6_residency.c index cd62e77a..f4d84776 100644 --- a/tests/sysfs_rc6_residency.c +++ b/tests/sysfs_rc6_residency.c @@ -63,6 +63,8 @@ int main(int argc, char *argv[]) FILE *file; int diff; + drmtest_skip_on_simulation(); + /* Use drm_open_any to verify device existence */ fd = drm_open_any(); close(fd); diff --git a/tests/sysfs_rps.c b/tests/sysfs_rps.c index 8ba541c4..480592a1 100644 --- a/tests/sysfs_rps.c +++ b/tests/sysfs_rps.c @@ -133,6 +133,8 @@ int main(int argc, char *argv[]) struct junk *junk = stuff; int fd, ret; + drmtest_skip_on_simulation(); + if (argc > 1) verbose++; diff --git a/tests/testdisplay.c b/tests/testdisplay.c index e5020c9a..3781612e 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -533,6 +533,8 @@ int main(int argc, char **argv) GMainLoop *mainloop; float force_clock; + drmtest_skip_on_simulation(); + enter_exec_path( argv ); opterr = 0; -- cgit v1.2.3