summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2024-11-28 14:27:56 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2024-11-28 14:56:46 +0900
commit84bf0b37741fadd88c8ce8591e77476880dd209a (patch)
tree08afb5a297c5d52e92d0c364fc280ce20d2e7501
parent03d9dfa60ce63c2f66ed56f1a6901165d2d3492e (diff)
Always declared gems that are test failures on Windows to allowed failures list
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/12193
-rw-r--r--.github/workflows/windows.yml2
-rw-r--r--tool/test-bundled-gems.rb5
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f606c14318..2736b813bb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -180,8 +180,6 @@ jobs:
- run: nmake test-bundled-gems
timeout-minutes: 30
- env:
- TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'net-imap,net-smtp,debug,rbs,typeprof'
if: ${{ matrix.test_task == 'test-bundled-gems' }}
- name: Set up Launchable
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 8ea365112c..39546803f4 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -9,7 +9,10 @@ ENV.delete("GNUMAKEFLAGS")
github_actions = ENV["GITHUB_ACTIONS"] == "true"
allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || ''
-allowed_failures = allowed_failures.split(',').reject(&:empty?)
+if RUBY_PLATFORM =~ /mswin|mingw/
+ allowed_failures = [allowed_failures, "net-imap,net-smtp,rbs,typeprof,debug"].join(',')
+end
+allowed_failures = allowed_failures.split(',').uniq.reject(&:empty?)
# make test-bundled-gems BUNDLED_GEMS=gem1,gem2,gem3
bundled_gems = ARGV.first || ''