https://git.ruby-lang.org/ruby.git/commit/?id=232e43fd52

From 232e43fd52e53f667c2c290cffb4afa524889f0f Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Thu, 25 Aug 2022 09:18:34 -0700
Subject: Respect RUBY_TESTOPTS on test-all
 (https://github.com/Shopify/ruby/pull/435)

* Respect RUBY_TESTOPTS on test-all

* Increase the Cirrus timeout

* Increase the CSV test timeout
---
 .cirrus.yml                    | 3 ++-
 test/csv/parse/test_general.rb | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 708a329e57..038df9530c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -91,6 +91,7 @@ yjit_task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L91
     matrix:
       CC: clang-12
       CC: gcc-11
+  timeout_in: 90m
   id_script: id
   set_env_script:
     # Set `GNUMAKEFLAGS`, because the flags are GNU make specific. Note using
@@ -136,7 +137,7 @@ yjit_task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L137
   make_btest_script: source $HOME/.cargo/env && make -j btest RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
 
   # Check that we can run test-all successfully (running TestGCCompact separately until we fix its performance)
-  make_test_all_script: source $HOME/.cargo/env && make -j test-all RUN_OPTS="--yjit-call-threshold=1" TESTOPTS='--name=!/TestGCCompact/'
+  make_test_all_script: source $HOME/.cargo/env && make -j test-all RUN_OPTS="--yjit-call-threshold=1" TESTOPTS="$RUBY_TESTOPTS"' --name=!/TestGCCompact/'
   test_gc_compact_script: source $HOME/.cargo/env && make -j test-all RUN_OPTS="--yjit-call-threshold=1" TESTS="test/ruby/test_gc_compact.rb"
 
   # Check that we can run test-spec successfully
diff --git a/test/csv/parse/test_general.rb b/test/csv/parse/test_general.rb
index d2b74008eb..c740462c01 100644
--- a/test/csv/parse/test_general.rb
+++ b/test/csv/parse/test_general.rb
@@ -247,6 +247,9 @@ line,5,jkl https://github.com/ruby/ruby/blob/trunk/test/csv/parse/test_general.rb#L247
   def assert_parse_errors_out(data, **options)
     assert_raise(CSV::MalformedCSVError) do
       timeout = 0.2
+      if defined?(RubyVM::YJIT.enabled?) and RubyVM::YJIT.enabled?
+        timeout = 1  # for --yjit-call-threshold=1
+      end
       if defined?(RubyVM::MJIT.enabled?) and RubyVM::MJIT.enabled?
         timeout = 5  # for --jit-wait
       end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/