Skip to content

Commit

Permalink
merge revision(s) 3eaae72:
Browse files Browse the repository at this point in the history
	test/fiber/test_queue.rb: Make the stuck test fail. (#8791)

	test/fiber/test_queue.rb: Make the stuck tests fail.

	We observed the 2 tests in the `test/fiber/test_queue.rb` getting stuck
	in some GCC compilers in Ubuntu ppc64le focal/jammy, even when the timeout
	`queue.pop(timeout: 0.0001)` is set in the code.

	This commit is to make the tests fail rather than getting stuck.
	---
	 test/fiber/test_queue.rb | 20 ++++++++++++++++----
	 1 file changed, 16 insertions(+), 4 deletions(-)
  • Loading branch information
nagachika committed Nov 19, 2023
1 parent 1cc38d5 commit 5e99483
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
20 changes: 16 additions & 4 deletions test/fiber/test_queue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
class TestFiberQueue < Test::Unit::TestCase
def test_pop_with_timeout
queue = Thread::Queue.new
kill = false
result = :unspecified

Thread.new do
thread = Thread.new do
scheduler = Scheduler.new
Fiber.set_scheduler(scheduler)

Expand All @@ -16,17 +17,23 @@ def test_pop_with_timeout
end

scheduler.run
end.join
end
until thread.join(2)
kill = true
thread.kill
end

assert_false(kill, 'Getting stuck due to a possible compiler bug.')
assert_nil result
end

def test_pop_with_timeout_and_value
queue = Thread::Queue.new
queue.push(:something)
kill = false
result = :unspecified

Thread.new do
thread = Thread.new do
scheduler = Scheduler.new
Fiber.set_scheduler(scheduler)

Expand All @@ -35,8 +42,13 @@ def test_pop_with_timeout_and_value
end

scheduler.run
end.join
end
until thread.join(2)
kill = true
thread.kill
end

assert_false(kill, 'Getting stuck due to a possible compiler bug.')
assert_equal :something, result
end
end
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 131
#define RUBY_PATCHLEVEL 132

#include "ruby/version.h"
#include "ruby/internal/abi.h"
Expand Down

0 comments on commit 5e99483

Please sign in to comment.