kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Respect RUBY_TESTOPTS on test-all (https://github.com/Shopify/ruby/pull/435)

Browse source 
* Respect RUBY_TESTOPTS on test-all

* Increase the Cirrus timeout

* Increase the CSV test timeout
This commit is contained in:
Takashi Kokubun 2022-08-25 09:18:34 -07:00
parent 5ef048e5b1
commit 232e43fd52
Notes: git 2022-08-30 01:10:10 +09:00 
Merged: https://github.com/ruby/ruby/pull/6289
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.cirrus.yml
View file

@ -91,6 +91,7 @@ yjit_task:
matrix: matrix:
CC: clang-12 CC: clang-12
CC: gcc-11 CC: gcc-11
timeout_in: 90m
id_script: id id_script: id
set_env_script: set_env_script:
# Set `GNUMAKEFLAGS`, because the flags are GNU make specific. Note using # 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" 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) # 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" 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 # Check that we can run test-spec successfully

3
test/csv/parse/test_general.rb
View file

@ -247,6 +247,9 @@ line,5,jkl
def assert_parse_errors_out(data, **options) def assert_parse_errors_out(data, **options)
assert_raise(CSV::MalformedCSVError) do assert_raise(CSV::MalformedCSVError) do
timeout = 0.2 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? if defined?(RubyVM::MJIT.enabled?) and RubyVM::MJIT.enabled?
timeout = 5 # for --jit-wait timeout = 5 # for --jit-wait
end end