Skip to content

Commit

Permalink
Update rev, remove whitelist and change default plan
Browse files Browse the repository at this point in the history
Updated the revision of the `mmtk-core` and the `ruby` repos.

Removed the whitelist.  Now we rely on the exclusion list in
`test/.excludes-mmtk` in the `ruby` repo.

Changed the default plan to StickyImmix since it has been stable so far.
  • Loading branch information
wks committed Sep 10, 2024
1 parent 89f6b52 commit af499a7
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 165 deletions.
2 changes: 0 additions & 2 deletions .github/scripts/ci-test-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ case $DEBUG_LEVEL in
echo "Skipping test-all for $DEBUG_LEVEL..."
;;
release)
TEST_CASES=$(cat $BINDING_PATH/ruby-test-cases.txt | grep -v '#' | ruby -ne 'puts "../#{$_}"' | xargs)
make test-all \
TESTS="$TEST_CASES" \
RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN" \
TESTOPTS="-v --excludes-dir=../test/.excludes-mmtk -j${CI_JOBS}"
;;
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUBY_PATH=$BINDING_PATH/../ruby
RUBY_BUILD_PATH=$RUBY_PATH/build
RUBY_INSTALL_PATH=$RUBY_BUILD_PATH/install
RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`
DEFAULT_PLAN=Immix
DEFAULT_PLAN=StickyImmix

CI_JOBS=4

Expand Down
25 changes: 14 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,23 +251,26 @@ make btest RUN_OPTS="--mmtk-plan=StickyImmix"

### All tests

Note that currently it is not our priority to support Ractor. Some tests
involving Ractors are not enabled. You can get a list of enabled tests in the
file `ruby-test-cases.txt`.
We excluded some tests when testing against MMTk. Those test cases are listed
in `test/.excludes-mmtk` in the [`mmtk/ruby`](https://github.com/mmtk/ruby.git)
repository.

To run the tests
- Test cases involving Ractors are excluded because it is currently not a
priority to support Ractors.
- Some tests involve implementation details of CRuby's default GC, such as
compaction and memsize. Those test cases are excluded, too.
- Other excluded tests involve things that are not implemented properly in the
MMTk binding.

```bash
TEST_CASES=$(grep -v '#' ../../mmtk-ruby/ruby-test-cases.txt | awk '{print("../"$1)}' | xargs)
make test-all TESTS="$TEST_CASES" RUN_OPTS="--mmtk-plan=StickyImmix"
```

Or in one line:
To run the tests, run the following command.

```bash
make test-all TESTS="$(grep -v '#' ../../mmtk-ruby/ruby-test-cases.txt | awk '{print("../"$1)}' | xargs)" RUN_OPTS="--mmtk-plan=StickyImmix"
make test-all RUN_OPTS="--mmtk-plan=StickyImmix" TESTOPTS="-v --excludes-dir=../test/.excludes-mmtk"
```

That assumes you are in the `build-debug` or `build-release` directory. Adjust
the path `../test/.excludes-mmtk` if you run it in a different directory.

## Current status

Known working:
Expand Down
38 changes: 19 additions & 19 deletions mmtk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2021"
# Metadata for the Ruby repository
[package.metadata.ci-repos.ruby]
repo = "mmtk/ruby" # This is used by actions/checkout, so the format is "owner/repo", not URL.
rev = "cd5e3561b6d564a9e5e70a12703873aa8a5f8252"
rev = "29612e349e01951af3562be9fc1e309e5268d9ff"

[lib]
name = "mmtk_ruby"
Expand All @@ -37,7 +37,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 = "45cdf31055b1b6a629bdb8032adaa6dd5a8e32b9"
rev = "a025c24104d8d456a865aa0122e6e0fb6d77e8f2"

# Uncomment the following line to use mmtk-core from a local repository.
#path = "../../mmtk-core"
Expand Down
130 changes: 0 additions & 130 deletions ruby-test-cases.txt

This file was deleted.

0 comments on commit af499a7

Please sign in to comment.