ruby-changes:72717
From: Takashi <ko1@a...>
Date: Thu, 28 Jul 2022 13:29:34 +0900 (JST)
Subject: [ruby-changes:72717] bee5089d67 (master): Try reproducing the MinGW hang on time command (#6168)
https://git.ruby-lang.org/ruby.git/commit/?id=bee5089d67 From bee5089d6789401f265f87b2f23f1bd7ec63cec8 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Wed, 27 Jul 2022 21:29:14 -0700 Subject: Try reproducing the MinGW hang on time command (#6168) to see if it really exits correctly. GitHub Support asked me to confirm the command is exiting correctly. --- .github/workflows/mingw.yml | 2 +- test/rinda/test_rinda.rb | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 80b7a92f15..2842a19f48 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -135,7 +135,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L135 run: | # Actions uses UTF8, causes test failures, similar to normal OS setup chcp.com 437 - make ${{ StartsWith(matrix.test_task, 'test/') && matrix.test_task || 'test-all' }} + time make ${{ StartsWith(matrix.test_task, 'test/') && matrix.test_task || 'test-all' }} env: RUBY_TESTOPTS: >- -j${{env.TEST_JOBS}} --retry --job-status=normal --show-skip --timeout-scale=1.5 diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index d8340e0fc4..d937cd0f45 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -496,10 +496,6 @@ class TupleSpaceProxyTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L496 include TupleSpaceTestModule def setup - if RUBY_PLATFORM.match?(/mingw/) - @omitted = true - omit 'This test seems to randomly hang on GitHub Actions MinGW UCRT64' - end super ThreadGroup.new.add(Thread.current) @ts_base = Rinda::TupleSpace.new(1) @@ -507,9 +503,6 @@ class TupleSpaceProxyTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L503 @server = DRb.start_service("druby://localhost:0") end def teardown - return if @omitted - @omitted = false - # implementation-dependent @ts_base.instance_eval{ if th = @keeper -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/