From 7ae48e5af29b361efb13dcb8e554a6d4d1c0c20c Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Wed, 7 Jun 2023 13:33:59 +0200 Subject: [PATCH] Don't consider Sys STM tests negative on ARM64 --- src/sys/stm_tests.ml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sys/stm_tests.ml b/src/sys/stm_tests.ml index 00420b8f0..0ae67ad87 100644 --- a/src/sys/stm_tests.ml +++ b/src/sys/stm_tests.ml @@ -314,19 +314,23 @@ struct | _,_ -> false end -let uname_os () = - let ic = Unix.open_process_in "uname -s" in +let run_cmd cmd = + let ic = Unix.open_process_in cmd in let os = In_channel.input_line ic in ignore (Unix.close_process_in ic); os +let uname_os () = run_cmd "uname -s" + +let arch () = run_cmd "opam var arch" + module Sys_seq = STM_sequential.Make(SConf) module Sys_dom = STM_domain.Make(SConf) ;; QCheck_base_runner.run_tests_main [ Sys_seq.agree_test ~count:1000 ~name:"STM Sys test sequential"; - if Sys.unix && uname_os () = Some "Linux" + if Sys.unix && (uname_os () = Some "Linux" || arch () = Some "arm64") then Sys_dom.agree_test_par ~count:200 ~name:"STM Sys test parallel" else Sys_dom.neg_agree_test_par ~count:1000 ~name:"STM Sys test parallel" ]