From f1e0822b5b220a70dc53cf9c0e37ec860aeb720e Mon Sep 17 00:00:00 2001 From: Kaiyeung Luk Date: Tue, 26 Mar 2024 23:05:39 +0000 Subject: [PATCH] Change the check to DR_HOST_X86 AND NOT DR_HOST_X64. --- suite/tests/CMakeLists.txt | 144 ++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 74 deletions(-) diff --git a/suite/tests/CMakeLists.txt b/suite/tests/CMakeLists.txt index 37a381dc2b6..d5d2539f039 100644 --- a/suite/tests/CMakeLists.txt +++ b/suite/tests/CMakeLists.txt @@ -6204,78 +6204,74 @@ endif () # TODO i#6417: The switch to AMD VM's for GA CI has broken many of our tests. # This includes timeouts which increases suite length. # The following tests are excluded until they are fixed. -if (UNIX AND X86 AND arg_32_only) - set_tests_properties( - code_api|api.detach - code_api|api.detach_spawn_quick_exit - code_api|api.ibl-stress - code_api|api.startstop - code_api|api.static_detach - code_api|api.static_prepop - code_api|api.static_signal - code_api|api.thread_churn - code_api|client.alloc - code_api|client.attach_blocking - code_api|client.attach_test - code_api|client.detach_test - code_api|client.drwrap-test-detach - code_api|client.flush - code_api|client.strace - code_api|common.decode-stress - code_api|linux.eintr - code_api|linux.eintr-noinline - code_api|tool.basic_counts - code_api|tool.drcacheoff.altbindir - code_api|tool.drcacheoff.burst_client - code_api|tool.drcacheoff.basic_counts - code_api|tool.drcacheoff.burst_futex - code_api|tool.drcacheoff.burst_malloc - code_api|tool.drcacheoff.burst_maps - code_api|tool.drcacheoff.burst_reattach - code_api|tool.drcacheoff.burst_replace - code_api|tool.drcacheoff.burst_replaceall - code_api|tool.drcacheoff.burst_static - code_api|tool.drcacheoff.burst_syscall_inject - code_api|tool.drcacheoff.burst_threadfilter - code_api|tool.drcacheoff.burst_threads - code_api|tool.drcacheoff.burst_threads_counts - code_api|tool.drcacheoff.burst_threadL0filter - code_api|tool.drcacheoff.func_view_noret - code_api|tool.drcacheoff.gencode - code_api|tool.drcacheoff.gencode_filtered - code_api|tool.drcacheoff.getretaddr_record_replace_retaddr - code_api|tool.drcacheoff.invariant_checker - code_api|tool.drcacheoff.invariant_checker_pthreads - code_api|tool.drcacheoff.legacy - code_api|tool.drcacheoff.max-global - code_api|tool.drcacheoff.sysnums - code_api|tool.drcacheoff.warmup-pthreads-2 - code_api|tool.drcacheoff.warmup-pthreads-max-refs - code_api|tool.drcacheoff.warmup-pthreads-max-trace-size - code_api|tool.drcacheoff.warmup-pthreads-windows-split - code_api|tool.drcacheoff.windows-split - code_api|tool.drcacheoff.windows-timestamps - code_api|tool.drcachesim.coherence - code_api|tool.drcachesim.delay-global - code_api|tool.drcachesim.filter-d - code_api|tool.drcachesim.filter-no-d - code_api|tool.drcachesim.invariants - code_api|tool.drcachesim.miss_analyzer - code_api|tool.drcachesim.scattergather-x86 - code_api|tool.drcachesim.threads - code_api|tool.drcachesim.threads-with-config-file - code_api|tool.drcachesim.windows-simple - code_api|tool.drcachesim.TLB-threads - code_api|tool.drcov.eintr - code_api|tool.histogram.offline - code_api|tool.record_filter - code_api|tool.record_filter_bycore_multi - code_api|tool.record_filter_bycore_uni - PROPERTIES LABELS X32_DENYLIST) -endif () - -if (LINUX AND X86 AND arg_32_only) - set_tests_properties( - code_api|tool.drcachesim.phys-threads_SUDO - PROPERTIES LABELS X32_DENYLIST) +if (DR_HOST_X86 AND NOT DR_HOST_X64) + if (UNIX) + set_tests_properties( + code_api|api.detach + code_api|api.detach_spawn_quick_exit + code_api|api.ibl-stress + code_api|api.startstop + code_api|api.static_detach + code_api|api.static_prepop + code_api|api.static_signal + code_api|api.thread_churn + code_api|client.alloc + code_api|client.attach_blocking + code_api|client.attach_test + code_api|client.detach_test + code_api|client.drwrap-test-detach + code_api|client.flush + code_api|client.strace + code_api|common.decode-stress + code_api|linux.eintr + code_api|linux.eintr-noinline + code_api|tool.basic_counts + code_api|tool.drcacheoff.altbindir + code_api|tool.drcacheoff.burst_client + code_api|tool.drcacheoff.basic_counts + code_api|tool.drcacheoff.burst_futex + code_api|tool.drcacheoff.burst_malloc + code_api|tool.drcacheoff.burst_maps + code_api|tool.drcacheoff.burst_reattach + code_api|tool.drcacheoff.burst_replace + code_api|tool.drcacheoff.burst_replaceall + code_api|tool.drcacheoff.burst_static + code_api|tool.drcacheoff.burst_syscall_inject + code_api|tool.drcacheoff.burst_threadfilter + code_api|tool.drcacheoff.burst_threads + code_api|tool.drcacheoff.burst_threads_counts + code_api|tool.drcacheoff.burst_threadL0filter + code_api|tool.drcacheoff.func_view_noret + code_api|tool.drcacheoff.gencode + code_api|tool.drcacheoff.gencode_filtered + code_api|tool.drcacheoff.getretaddr_record_replace_retaddr + code_api|tool.drcacheoff.invariant_checker + code_api|tool.drcacheoff.invariant_checker_pthreads + code_api|tool.drcacheoff.legacy + code_api|tool.drcacheoff.max-global + code_api|tool.drcacheoff.sysnums + code_api|tool.drcacheoff.warmup-pthreads-2 + code_api|tool.drcacheoff.warmup-pthreads-max-refs + code_api|tool.drcacheoff.warmup-pthreads-max-trace-size + code_api|tool.drcacheoff.warmup-pthreads-windows-split + code_api|tool.drcacheoff.windows-split + code_api|tool.drcacheoff.windows-timestamps + code_api|tool.drcachesim.coherence + code_api|tool.drcachesim.delay-global + code_api|tool.drcachesim.filter-d + code_api|tool.drcachesim.filter-no-d + code_api|tool.drcachesim.invariants + code_api|tool.drcachesim.miss_analyzer + code_api|tool.drcachesim.scattergather-x86 + code_api|tool.drcachesim.threads + code_api|tool.drcachesim.threads-with-config-file + code_api|tool.drcachesim.windows-simple + code_api|tool.drcachesim.TLB-threads + code_api|tool.drcov.eintr + code_api|tool.histogram.offline + code_api|tool.record_filter + code_api|tool.record_filter_bycore_multi + code_api|tool.record_filter_bycore_uni + PROPERTIES LABELS X32_DENYLIST) + endif () endif ()