diff options
| -rw-r--r-- | gc/mmtk/Cargo.lock | 4 | ||||
| -rw-r--r-- | gc/mmtk/Cargo.toml | 2 | ||||
| -rw-r--r-- | test/mmtk/test_configuration.rb | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/gc/mmtk/Cargo.lock b/gc/mmtk/Cargo.lock index c460b2c1a2..cf08c86955 100644 --- a/gc/mmtk/Cargo.lock +++ b/gc/mmtk/Cargo.lock @@ -432,7 +432,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.30.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=c61e6c84f97ddb91e47d76914af2f7e462f1c7f8#c61e6c84f97ddb91e47d76914af2f7e462f1c7f8" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=051bc7470feef915c445305301e6113f86d3957b#051bc7470feef915c445305301e6113f86d3957b" dependencies = [ "atomic", "atomic-traits", @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.30.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=c61e6c84f97ddb91e47d76914af2f7e462f1c7f8#c61e6c84f97ddb91e47d76914af2f7e462f1c7f8" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=051bc7470feef915c445305301e6113f86d3957b#051bc7470feef915c445305301e6113f86d3957b" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/gc/mmtk/Cargo.toml b/gc/mmtk/Cargo.toml index 49237eb84e..a8c993560e 100644 --- a/gc/mmtk/Cargo.toml +++ b/gc/mmtk/Cargo.toml @@ -26,7 +26,7 @@ features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery # Uncomment the following lines to use mmtk-core from the official repository. git = "https://github.com/mmtk/mmtk-core.git" -rev = "c61e6c84f97ddb91e47d76914af2f7e462f1c7f8" +rev = "051bc7470feef915c445305301e6113f86d3957b" # Uncomment the following line to use mmtk-core from a local repository. # path = "../../../mmtk-core" diff --git a/test/mmtk/test_configuration.rb b/test/mmtk/test_configuration.rb index 88ae429e90..bde3366fa7 100644 --- a/test/mmtk/test_configuration.rb +++ b/test/mmtk/test_configuration.rb @@ -34,10 +34,9 @@ module MMTk assert_equal(1 * 1024 * 1024, GC.config[:mmtk_heap_min]) RUBY - # TODO: uncomment this test when the infinite loop is fixed - # assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "1" }], <<~RUBY) - # assert_equal(1, GC.config[:mmtk_heap_min]) - # RUBY + assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "1" }], <<~RUBY) + assert_equal(1, GC.config[:mmtk_heap_min]) + RUBY assert_separately([{ "MMTK_HEAP_MODE" => "dynamic", "MMTK_HEAP_MIN" => "10MiB", "MMTK_HEAP_MAX" => "1GiB" }], <<~RUBY) assert_equal(10 * 1024 * 1024, GC.config[:mmtk_heap_min]) |