Skip to content

Commit 1f445a1

Browse files
committed
[GR-16046] Use a method just doing yield rather than 1.times in Binding PE tests.
PullRequest: truffleruby/861
2 parents 01644d3 + 1411fbe commit 1f445a1

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

test/truffle/compiler/pe.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
source test/truffle/common.sh.inc
44

5-
jt ruby --vm.Dgraal.TruffleCompilationExceptionsAreThrown=true --vm.Dgraal.TruffleIterativePartialEscape=true --experimental-options --basic-ops-inline=false test/truffle/compiler/pe/pe.rb "$@"
5+
jt ruby --vm.Dgraal.TruffleCompilationExceptionsAreThrown=true --vm.Dgraal.TruffleIterativePartialEscape=true test/truffle/compiler/pe/pe.rb "$@"

test/truffle/compiler/pe/core/binding_pe.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
# GNU General Public License version 2, or
77
# GNU Lesser General Public License version 2.1.
88

9+
module BindingFixtures
10+
def self.yielder
11+
yield
12+
end
13+
end
14+
915
# Kernel#binding
1016
example "x = 14; binding.local_variable_get(:x)", 14
1117

@@ -23,13 +29,13 @@
2329
example "b = binding.dup; b.local_variable_set(:x, 14); b.local_variable_get(:x)", 14
2430

2531
# get (2 levels)
26-
example "x = 14; y = nil; 1.times { y = binding.local_variable_get(:x) }; y", 14
32+
example "x = 14; y = nil; BindingFixtures.yielder { y = binding.local_variable_get(:x) }; y", 14
2733

2834
# set (2 levels)
29-
example "x = nil; 1.times { binding.local_variable_set(:x, 15) }; x", 15
35+
example "x = nil; BindingFixtures.yielder { binding.local_variable_set(:x, 15) }; x", 15
3036

3137
# get + set (2 levels)
32-
example "x = 14; y = nil; 1.times { binding.local_variable_set(:x, 15); y = binding.local_variable_get(:x) }; y", 15
38+
example "x = 14; y = nil; BindingFixtures.yielder { binding.local_variable_set(:x, 15); y = binding.local_variable_get(:x) }; y", 15
3339

3440
# defined
3541

test/truffle/compiler/pe/core/fixnum_pe.rb renamed to test/truffle/compiler/pe/core/integer_pe.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@
2424
counter example "14 / rand"
2525

2626
example "14 <=> 2", 1
27+
28+
example "x = 0; 1.times { x = 14 }; x", 14
29+
30+
example "sum = 0; 3.times { sum += 14 }; sum", 42

test/truffle/compiler/pe/core/string_pe.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
example "'A' == String.from_codepoint(65, Encoding::US_ASCII)", true
5050
example "'A' == 65.chr", true
51-
example "'A'.ord == 65", true
51+
tagged example "'A'.ord == 65", true
5252

5353
example "'aba'[0] == 'aca'[-1]", true
5454

@@ -66,8 +66,8 @@
6666

6767
example "x = 'abc'; y = 'xyz'; x.replace(y) == y", true
6868

69-
example "'abc'.getbyte(0) == 97", true
70-
example "'abc'.getbyte(-1) == 99", true
69+
tagged example "'abc'.getbyte(0) == 97", true
70+
tagged example "'abc'.getbyte(-1) == 99", true
7171
example "'abc'.getbyte(10_000) == nil", true
7272

7373
example "14.to_s.length", 2

test/truffle/compiler/pe/pe.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def counter(example)
7070
require_relative 'language/defined_pe.rb'
7171
require_relative 'language/global_pe.rb'
7272
require_relative 'core/truefalse_pe.rb'
73-
require_relative 'core/fixnum_pe.rb'
73+
require_relative 'core/integer_pe.rb'
7474
require_relative 'core/float_pe.rb'
7575
require_relative 'core/symbol_pe.rb'
7676
require_relative 'core/method_pe.rb'

tool/jt.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2297,7 +2297,7 @@ def dockerfile(*args)
22972297
end
22982298

22992299
configs.each do |config|
2300-
lines.push "RUN " + setup_env["ruby #{config} --vm.Dgraal.TruffleCompilationExceptionsAreThrown=true --vm.Dgraal.TruffleIterativePartialEscape=true --experimental-options --basic-ops-inline=false pe/pe.rb"]
2300+
lines.push "RUN " + setup_env["ruby #{config} --vm.Dgraal.TruffleCompilationExceptionsAreThrown=true --vm.Dgraal.TruffleIterativePartialEscape=true pe/pe.rb"]
23012301
end
23022302
end
23032303

0 commit comments

Comments
 (0)