Skip to content

Commit

Permalink
Temporarily disable rb_str_concat, add CI tests (#407)
Browse files Browse the repository at this point in the history
Make sure we can load the test-all runner and run test_yjit.rb
  • Loading branch information
maximecb authored and k0kubun committed Aug 25, 2022
1 parent 622645d commit 914b726
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
11 changes: 9 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@ yjit_task:
bootstraptest/test_yjit_rust_port.rb \
bootstraptest/test_yjit.rb
# FIXME: not currently working on CI, missing cargo
# Check that we can do a full ruby build
#full_build_script: make -j
full_build_script: source $HOME/.cargo/env && make -j

# Check that we can build rdoc successfully
make_rdoc_script: source $HOME/.cargo/env && make -j rdoc

# Run John's YJIT instruction tests, and make sure we can load the test-all runner
test_yjit_script: source $HOME/.cargo/env && make test-all TESTS='test/ruby/test_yjit.rb' RUN_OPTS="--yjit-call-threshold=1"

# TODO: check that we can we run all of test-all successfully
11 changes: 8 additions & 3 deletions .github/workflows/yjit-new-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,13 @@ jobs:
bootstraptest/test_yjit_rust_port.rb \
bootstraptest/test_yjit.rb
# Try building rdoc
- run: make -j rdoc

# Check that we can do a full ruby build
- run: make -j

# Check that we can build rdoc successfully
- run: make -j rdoc

# Run John's YJIT instruction tests, and make sure we can load the test-all runner
- run: make test-all TESTS='test/ruby/test_yjit.rb' RUN_OPTS="--yjit-call-threshold=1"

# TODO: check that we can we run all of test-all successfully
2 changes: 1 addition & 1 deletion yjit/src/codegen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6134,7 +6134,7 @@ impl CodegenGlobals {
//self.yjit_reg_method(rb_cString, "to_s", jit_rb_str_to_s);
//self.yjit_reg_method(rb_cString, "to_str", jit_rb_str_to_s);
self.yjit_reg_method(rb_cString, "bytesize", jit_rb_str_bytesize);
self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat);
//self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat);
//self.yjit_reg_method(rb_cString, "+@", jit_rb_str_uplus);

// Thread.current
Expand Down

0 comments on commit 914b726

Please sign in to comment.