Skip to content

Commit ed78d8b

Browse files
committed
ZJIT: Update test targets and documentation
- Rename `zjit-test-all` to `zjit-check` - Add `zjit-test-all` target to zjit.mk to run all Ruby tests with ZJIT enabled excluding known failing tests - Update documentation and CI workflow to reflect the new targets
1 parent e90d490 commit ed78d8b

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

.github/workflows/zjit-macos.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ jobs:
3838
- test_task: 'ruby' # build test for combo build
3939
configure: '--enable-yjit --enable-zjit'
4040

41-
- test_task: 'test-all'
41+
- test_task: 'zjit-test-all'
4242
configure: '--enable-zjit=dev'
43-
tests: '../src/test/ruby/test_zjit.rb'
4443

4544
- test_task: 'btest'
4645
configure: '--enable-zjit=dev'

.github/workflows/zjit-ubuntu.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ jobs:
4040
- test_task: 'zjit-test'
4141
configure: '--enable-yjit --enable-zjit=dev'
4242

43-
- test_task: 'test-all'
43+
- test_task: 'zjit-test-all'
4444
configure: '--enable-zjit=dev'
45-
tests: '../src/test/ruby/test_zjit.rb'
4645

4746
- test_task: 'btest'
4847
configure: '--enable-zjit=dev'

doc/zjit.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ in a way that can be easily shared with other team members.
2828

2929
Make sure you have a `--enable-zjit=dev` build, and run `brew install cargo-nextest` first.
3030

31-
### make zjit-test-all
31+
### make zjit-check
3232

3333
This command runs all ZJIT tests: `make zjit-test` and `test/ruby/test_zjit.rb`.
3434

3535
```
36-
make zjit-test-all
36+
make zjit-check
3737
```
3838

3939
### make zjit-test
@@ -78,6 +78,16 @@ use `make`.
7878

7979
</details>
8080

81+
### make zjit-test-all
82+
83+
```
84+
make zjit-test-all
85+
```
86+
87+
This command runs all Ruby tests under `/test/ruby/` with ZJIT enabled.
88+
89+
Certain tests are excluded under `/test/.excludes-zjit`.
90+
8191
### test/ruby/test\_zjit.rb
8292

8393
This command runs Ruby execution tests.

zjit/zjit.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,15 @@ update-zjit-bench:
4949
https://github.com/Shopify/zjit-bench zjit-bench $(GIT_OPTS)
5050

5151
# Gives quick feedback about ZJIT. Not a replacement for a full test run.
52-
.PHONY: zjit-test-all
53-
zjit-test-all:
52+
.PHONY: zjit-check
53+
zjit-check:
5454
$(MAKE) zjit-test
5555
$(MAKE) test-all TESTS='$(top_srcdir)/test/ruby/test_zjit.rb'
5656

57+
.PHONY: zjit-test-all
58+
zjit-test-all:
59+
$(MAKE) test-all RUST_BACKTRACE=1 TEST_EXCLUDES='--excludes-dir=$(top_srcdir)/test/.excludes-zjit --name=!/memory_leak/' RUN_OPTS='--zjit --zjit-call-threshold=1' TESTS='$(top_srcdir)/test/ruby/'
60+
5761
ZJIT_BINDGEN_DIFF_OPTS =
5862

5963
# Generate Rust bindings. See source for details.

0 commit comments

Comments
 (0)