ruby-changes:59561
From: MSP-Greg <ko1@a...>
Date: Tue, 31 Dec 2019 16:19:52 +0900 (JST)
Subject: [ruby-changes:59561] eb2b425821 (master): MinGW on Actions (#2791)
https://git.ruby-lang.org/ruby.git/commit/?id=eb2b425821 From eb2b4258214337f165eb994e2c5b9c2a3f6ae0a8 Mon Sep 17 00:00:00 2001 From: MSP-Greg <MSP-Greg@u...> Date: Tue, 31 Dec 2019 01:19:31 -0600 Subject: MinGW on Actions (#2791) * MinGW - skip spec in spec/ruby/optional/capi/thread_spec.rb C-API Thread function rb_thread_call_without_gvl -- runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO stops/freezes spec tests See https://bugs.ruby-lang.org/issues/16265 * MinGW - skip test test/resolv/test_dns.rb Test times out in CI (both AppVeyor & Actions), cannot repo locally * MinGW - skip test test/ruby/test_thread_queue.rb * Add Actions mingw.yml diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml new file mode 100644 index 0000000..e754607 --- /dev/null +++ b/.github/workflows/mingw.yml @@ -0,0 +1,133 @@ https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L1 +name: Windows +on: + push: + branches: + - '*' + pull_request: + branches: + - '*' + +# Notes: +# Action ENV TEMP and TMP are short 8.3 paths, but the long path differs. +# Code uses TMPDIR, which is Ruby's 'first' check +# +# Console encoding causes issues, see test-all & test-spec steps +# +jobs: + mingw: + runs-on: windows-2019 + env: + MSYSTEM: MINGW64 + MSYSTEM_PREFIX: /mingw64 + MSYS2_ARCH: x86_64 + CHOST: "x86_64-w64-mingw32" + CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe -fstack-protector-strong" + CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe" + CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048" + LDFLAGS: "-pipe -fstack-protector-strong" + UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." + strategy: + fail-fast: false + if: "!contains(github.event.head_commit.message, '[ci skip]')" + steps: + - name: git config + run: | + git config --system core.autocrlf false + git config --system core.eol lf + - name: Checkout repo + uses: actions/checkout@v2 + with: + path: src + - run: ./src/tool/actions-commit-info.sh + shell: bash + id: commit_info + - name: Set up Ruby & MSYS2 + uses: MSP-Greg/actions-ruby@master + with: + ruby-version: 2.6.x + base: update + mingw: gdbm gmp libffi libyaml openssl ragel readline + msys2: automake1.16 bison + - name: where check + run: | + # show where + Write-Host + $where = 'gcc.exe', 'ragel.exe', 'make.exe', 'bison.exe', 'libcrypto-1_1-x64.dll', 'libssl-1_1-x64.dll' + foreach ($e in $where) { + $rslt = where.exe $e 2>&1 | Out-String + if ($rslt.contains($e)) { Write-Host $rslt } + else { Write-Host "`nCan't find $e" } + } + - name: misc setup, autoreconf + run: | + mkdir build + mkdir install + mkdir temp + cd src + sh -c "autoreconf -fi" + + - name: configure + run: | + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + cd build + $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST" + Write-Host $config_args + sh -c "../src/configure --disable-install-doc --prefix=/install $config_args" + # Write-Host "-------------------------------------- config.log" + # Get-Content ./config.log | foreach {Write-Output $_} + + - name: download unicode, gems, etc + run: | + $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 + cd build + make -j $jobs update-unicode + make -j $jobs update-gems + + - name: make compile + timeout-minutes: 20 + run: | + $jobs = [int]$env:NUMBER_OF_PROCESSORS + 1 + make -C build -j $jobs V=1 + + - name: make install + run: | + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + make -C build DESTDIR=.. install-nodoc + + - name: test + timeout-minutes: 5 + run: | + $env:TMPDIR = "$pwd/temp" + make -C build test + + - name: test-spec + if: success() || failure() + timeout-minutes: 10 + run: | + $env:TMPDIR = "$pwd/temp" + $env:PATH = "$pwd/install/bin;$env:PATH" + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + ruby -v + cd src/spec/ruby + ruby ../mspec/bin/mspec -j + + - name: test-all + if: success() || failure() + timeout-minutes: 25 + run: | + $env:TMPDIR = "$pwd/temp" + # Actions uses UTF8, causes test failures, similar to normal OS setup + $PSDefaultParameterValues['*:Encoding'] = 'utf8' + [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") + $jobs = [int]$env:NUMBER_OF_PROCESSORS + make -C build test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../src/test/excludes -n !/memory_leak/ -j $jobs" diff --git a/spec/ruby/optional/capi/thread_spec.rb b/spec/ruby/optional/capi/thread_spec.rb index 17fe373..df454d1 100644 --- a/spec/ruby/optional/capi/thread_spec.rb +++ b/spec/ruby/optional/capi/thread_spec.rb @@ -121,23 +121,25 @@ describe "C-API Thread function" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/thread_spec.rb#L121 thr.value.should be_true end - it "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" do - thr = Thread.new do - @t.rb_thread_call_without_gvl_with_ubf_io - end + guard -> { platform_is :mingw and ruby_version_is ""..."2.7" } do + it "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" do + thr = Thread.new do + @t.rb_thread_call_without_gvl_with_ubf_io + end - # Wait until it's blocking... - Thread.pass while thr.status and thr.status != "sleep" + # Wait until it's blocking... + Thread.pass while thr.status and thr.status != "sleep" - # The thread status is set to sleep by rb_thread_call_without_gvl(), - # but the thread might not be in the blocking read(2) yet, so wait a bit. - sleep 0.1 + # The thread status is set to sleep by rb_thread_call_without_gvl(), + # but the thread might not be in the blocking read(2) yet, so wait a bit. + sleep 0.1 - # Wake it up, causing the unblock function to be run. - thr.wakeup + # Wake it up, causing the unblock function to be run. + thr.wakeup - # Make sure it stopped and we got a proper value - thr.value.should be_true + # Make sure it stopped and we got a proper value + thr.value.should be_true + end end end end diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index d69bec8..70d5067 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -162,10 +162,19 @@ class TestResolvDNS < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/resolv/test_dns.rb#L162 # A race condition here. # Another program may use the port. # But no way to prevent it. - Timeout.timeout(5) do - Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns| - assert_equal([], dns.getresources("test-no-server.example.org", Resolv::DNS::Resource::IN::A)) - } + begin + Timeout.timeout(5) do + Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns| + assert_equal([], dns.getresources("test-no-server.example.org", Resolv::DNS::Resource::IN::A)) + } + end + rescue Timeout::Error + if RUBY_PLATFORM.match?(/mingw/) + # cannot repo locally + skip 'Timeout Error on MinGW CI' + else + raise Timeout::Error + end end end diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb index e46f0b2..41e6865 100644 --- a/test/ruby/test_thread_queue.rb +++ b/test/ruby/test_thread_queue.rb @@ -560,6 +560,10 @@ class TestThreadQueue < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_thread_queue.rb#L560 if ENV['APPVEYOR'] == 'True' && RUBY_PLATFORM.match?(/mswin/) skip 'This test fails too often on AppVeyor vs140' end + if RUBY_PLATFORM.match?(/mingw/) + skip 'This test fails too often on MinGW' + end + assert_in_out_err([], <<-INPUT, %w(INT INT exit), []) q = Queue.new trap(:INT){ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/