diff options
| -rw-r--r-- | .github/workflows/windows.yml | 20 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/rbasic_spec.rb | 1 | ||||
| -rw-r--r-- | test/resolv/test_dns.rb | 1 | ||||
| -rw-r--r-- | test/ruby/test_file_exhaustive.rb | 1 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_builder.rb | 3 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 1 | ||||
| -rw-r--r-- | test/rubygems/test_gem_resolver_git_specification.rb | 1 | ||||
| -rw-r--r-- | tool/test/webrick/test_filehandler.rb | 1 | ||||
| -rw-r--r-- | tool/test/webrick/test_httpproxy.rb | 1 |
9 files changed, 27 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 700b9b95fc..a8dd64eb35 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -4,7 +4,7 @@ jobs: make: strategy: matrix: - test_task: [test] + test_task: [check] # to make job names consistent os: [windows-2019] vs: [2019] fail-fast: false @@ -62,10 +62,24 @@ jobs: nmake extract-extlibs nmake - name: nmake test - timeout-minutes: 30 + timeout-minutes: 5 run: | call "%VCVARS%" - nmake ${{ matrix.test_task }} + nmake test + - name: nmake test-all + timeout-minutes: 60 + run: | + call "%VCVARS%" + # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent. + # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302 + set TMP=%USERPROFILE%\AppData\Local\Temp + set TEMP=%USERPROFILE%\AppData\Local\Temp + nmake test-all + - name: nmake test-spec + timeout-minutes: 10 + run: | + call "%VCVARS%" + nmake test-spec - uses: k0kubun/action-slack@v2.0.0 with: payload: | diff --git a/spec/ruby/optional/capi/rbasic_spec.rb b/spec/ruby/optional/capi/rbasic_spec.rb index 283e70db70..691c4250d2 100644 --- a/spec/ruby/optional/capi/rbasic_spec.rb +++ b/spec/ruby/optional/capi/rbasic_spec.rb @@ -1,6 +1,7 @@ require_relative 'spec_helper' require_relative 'shared/rbasic' load_extension("rbasic") +return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning load_extension("data") load_extension("array") diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index d3c4b1f3e9..1f1555fecc 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -268,6 +268,7 @@ class TestResolvDNS < Test::Unit::TestCase end def test_no_server + skip if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning u = UDPSocket.new u.bind("127.0.0.1", 0) _, port, _, host = u.addr diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 0ccf99312b..70966d83a4 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -1257,6 +1257,7 @@ class TestFileExhaustive < Test::Unit::TestCase assert_equal(regular_file, File.dirname(regular_file, 0)) assert_equal(@dir, File.dirname(regular_file, 1)) assert_equal(File.dirname(@dir), File.dirname(regular_file, 2)) + return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # rootdir and tmpdir are in different drives assert_equal(rootdir, File.dirname(regular_file, regular_file.count('/'))) assert_raise(ArgumentError) {File.dirname(regular_file, -1)} end diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 6bebfa7a03..b687a08771 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -106,6 +106,7 @@ install: end def test_build_extensions + skip if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning @spec.extensions << 'ext/extconf.rb' ext_dir = File.join @spec.gem_dir, 'ext' @@ -141,6 +142,7 @@ install: end def test_build_extensions_with_gemhome_with_space + skip if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning new_gemhome = File.join @tempdir, 'gem home' File.rename(@gemhome, new_gemhome) @gemhome = new_gemhome @@ -161,6 +163,7 @@ install: false end end + skip if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning @spec.extensions << 'ext/extconf.rb' diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 88d54901eb..0d1f2c4102 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1482,6 +1482,7 @@ gem 'other', version def test_install_extension_and_script skip "Makefile creation crashes on jruby" if Gem.java_platform? + skip if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning @spec = setup_base_spec @spec.extensions << "extconf.rb" diff --git a/test/rubygems/test_gem_resolver_git_specification.rb b/test/rubygems/test_gem_resolver_git_specification.rb index 4283e02765..c2ed1b502d 100644 --- a/test/rubygems/test_gem_resolver_git_specification.rb +++ b/test/rubygems/test_gem_resolver_git_specification.rb @@ -63,6 +63,7 @@ class TestGemResolverGitSpecification < Gem::TestCase def test_install_extension skip if Gem.java_platform? + skip if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning name, _, repository, = git_gem 'a', 1 do |s| s.extensions << 'ext/extconf.rb' end diff --git a/tool/test/webrick/test_filehandler.rb b/tool/test/webrick/test_filehandler.rb index 998e03f690..146d8ce792 100644 --- a/tool/test/webrick/test_filehandler.rb +++ b/tool/test/webrick/test_filehandler.rb @@ -247,6 +247,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase def test_short_filename return if File.executable?(__FILE__) # skip on strange file system + return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning config = { :CGIInterpreter => TestWEBrick::RubyBin, diff --git a/tool/test/webrick/test_httpproxy.rb b/tool/test/webrick/test_httpproxy.rb index 1c2f2fce52..66dae6f6f6 100644 --- a/tool/test/webrick/test_httpproxy.rb +++ b/tool/test/webrick/test_httpproxy.rb @@ -323,6 +323,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase end if defined?(OpenSSL::SSL) def test_upstream_proxy + return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning # Testing GET or POST through the upstream proxy server # Note that the upstream proxy server works as the origin server. # +------+ |