Merge pull request ruby#13 from chrisseaton/mmtk-btest

chrisseaton · web-flow · commit e478bd32ca70 · 2022-07-28T12:42:44.000+01:00
Let us run make btest
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
@@ -720,4 +720,8 @@ def check_coredump
   end
 end
 
+def mmtk?
+  `#{BT.ruby} -e 'p defined?(GC::MMTk)'`.strip == '"constant"'
+end
+
 exit main
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
@@ -1,3 +1,5 @@
+return if mmtk?
+
 # Ractor.current returns a current ractor
 assert_equal 'Ractor', %q{
   Ractor.current.class
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
@@ -1,3 +1,5 @@
+return if mmtk?
+
 show_limit %q{
   threads = []
   begin
diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb
@@ -1,3 +1,5 @@
+return if mmtk?
+
 assert_equal 'true', %q{
   # regression test for tracking type of locals for too long
   def local_setting_cmp(five)
diff --git a/bootstraptest/test_yjit_30k_ifelse.rb b/bootstraptest/test_yjit_30k_ifelse.rb
@@ -1,3 +1,5 @@
+return if mmtk?
+
 # This is a torture test for the JIT.
 # There are 30K tiny methods with if-else statements in a 30-deep call hierarchy.
 assert_equal '100000', %q{
diff --git a/bootstraptest/test_yjit_30k_methods.rb b/bootstraptest/test_yjit_30k_methods.rb
@@ -1,3 +1,5 @@
+return if mmtk?
+
 # This is a torture test for the JIT.
 # There are 30K tiny methods in a 30-deep call hierarchy.
 assert_equal '1000000', %q{
diff --git a/bootstraptest/test_yjit_rust_port.rb b/bootstraptest/test_yjit_rust_port.rb
@@ -1,3 +1,5 @@
+return if mmtk?
+
 # Simple tests that we know we can pass
 # To keep track of what we got working during the Rust port
 # And avoid breaking/losing functionality

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+return if mmtk?`
	`2`	`+`
`1`	`3`	`# Ractor.current returns a current ractor`
`2`	`4`	`assert_equal 'Ractor', %q{`
`3`	`5`	`Ractor.current.class`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+return if mmtk?`
	`2`	`+`
`1`	`3`	`show_limit %q{`
`2`	`4`	`threads = []`
`3`	`5`	`begin`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+return if mmtk?`
	`2`	`+`
`1`	`3`	`assert_equal 'true', %q{`
`2`	`4`	`# regression test for tracking type of locals for too long`
`3`	`5`	`def local_setting_cmp(five)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+return if mmtk?`
	`2`	`+`
`1`	`3`	`# This is a torture test for the JIT.`
`2`	`4`	`# There are 30K tiny methods with if-else statements in a 30-deep call hierarchy.`
`3`	`5`	`assert_equal '100000', %q{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+return if mmtk?`
	`2`	`+`
`1`	`3`	`# Simple tests that we know we can pass`
`2`	`4`	`# To keep track of what we got working during the Rust port`
`3`	`5`	`# And avoid breaking/losing functionality`