From 68ad2fbca39a91981cd4bbae31004306deb23136 Mon Sep 17 00:00:00 2001 From: Joshua Warburton Date: Fri, 24 Feb 2023 13:42:05 +0000 Subject: [PATCH 1/2] i#5507: AArch64 testing: Mark windows-zlib as flaky and extend timeouts Windows-zlib fails about 5% of the time for currently unknown reasons. A reproducer has been submitted to the associated ticket and this patch marks it as flaky. The patch also increases the timeouts of linux.sigmask and drstatecmp_fuzz which were slightly exceeding them. issue: #5507 Change-Id: Iec8af0a2e6b3530fd74b4c90b953154dba74b5ed --- suite/runsuite_wrapper.pl | 3 ++- suite/tests/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/suite/runsuite_wrapper.pl b/suite/runsuite_wrapper.pl index 84d7ade78ab..aee2ed48817 100755 --- a/suite/runsuite_wrapper.pl +++ b/suite/runsuite_wrapper.pl @@ -342,7 +342,8 @@ 'code_api|client.attach_test' => 1, # i#5740 'code_api|client.attach_blocking' => 1, # i#5740 'code_api|tool.drcacheoff.invariant_checker' => 1, # i#5724 - 'code_api|tool.drcacheoff.rseq' => 1 # i#5734 + 'code_api|tool.drcacheoff.rseq' => 1, # i#5734 + 'code_api|tool.drcacheoff.windows-zlib' => 1, # i#5507 ); if ($is_32) { $issue_no = "#2416"; diff --git a/suite/tests/CMakeLists.txt b/suite/tests/CMakeLists.txt index d6b1af7ee81..994556b6c4f 100644 --- a/suite/tests/CMakeLists.txt +++ b/suite/tests/CMakeLists.txt @@ -4099,6 +4099,7 @@ if (BUILD_CLIENTS) if (AARCH64) torunonly_drcachesim(drstatecmp-fuzz drstatecmp-fuzz-app "-trace_after_instrs 10M -enable_drstatecmp" "" "") + set(tool.drcachesim.drstatecmp-fuzz_timeout 180) endif () if (NOT WIN32) torunonly_drcachesim(drstatecmp-delay-simple ${ci_shared_app} @@ -4626,6 +4627,7 @@ if (UNIX) tobuild(linux.sigmask linux/sigmask.c) link_with_pthread(linux.sigmask) + set(linux.sigmask_timeout 180) # Sanity check that this option works. torunonly(linux.sigmask-noalarm linux.sigmask linux/sigmask.c "-no_reroute_alarm_signals" "") From 0701bf504eb3c99147b67879ef78a725b784a862 Mon Sep 17 00:00:00 2001 From: Joshua Warburton Date: Tue, 28 Feb 2023 10:49:08 +0000 Subject: [PATCH 2/2] restore default timeout Change-Id: I64283f3d5fe338d11b02b0e2fdde53488842716d --- suite/tests/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/suite/tests/CMakeLists.txt b/suite/tests/CMakeLists.txt index 9470f525bf8..6c5175c3117 100644 --- a/suite/tests/CMakeLists.txt +++ b/suite/tests/CMakeLists.txt @@ -4630,7 +4630,6 @@ if (UNIX) tobuild(linux.sigmask linux/sigmask.c) link_with_pthread(linux.sigmask) - set(linux.sigmask_timeout 180) # Sanity check that this option works. torunonly(linux.sigmask-noalarm linux.sigmask linux/sigmask.c "-no_reroute_alarm_signals" "")