diff options
| author | Takashi Kokubun <[email protected]> | 2022-08-25 09:18:34 -0700 |
|---|---|---|
| committer | Takashi Kokubun <[email protected]> | 2022-08-29 09:09:41 -0700 |
| commit | 232e43fd52e53f667c2c290cffb4afa524889f0f (patch) | |
| tree | fd0362f5d665886762a6919ac18210d74ee5f222 | |
| parent | 5ef048e5b1c3dd61adf782ace570bb0a1f9bb12f (diff) | |
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
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6289
| -rw-r--r-- | .cirrus.yml | 3 | ||||
| -rw-r--r-- | test/csv/parse/test_general.rb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 708a329e57..038df9530c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -91,6 +91,7 @@ yjit_task: 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: 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 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 |