Skip to content

Commit 5440a16

Browse files
committed
[Rb] Implements bridge name and adds it to suites
1 parent 35600d7 commit 5440a16

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

rosetta-test-rb/json-rfc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "json"
22
require_relative "rosetta"
33

4-
suite "rosetta-test-suites/json-rfc.ros" do
4+
suite "stdlib json", "rosetta-test-suites/json-rfc.ros" do
55
expected_failures :test_n_string_escape_x,
66
:test_n_string_escaped_emoji,
77
:test_n_string_incomplete_surrogate_escape_invalid,

rosetta-test-rb/rosetta.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,15 @@ def rosetta_thread_yield
9696
end
9797

9898
class RosettaTestSuite
99-
attr_reader :scheme_env, :suite_name, :suite_version, :sources,
100-
:placeholders, :root_capability
99+
attr_reader :scheme_env, :suite_name, :bridge_name, :suite_version,
100+
:sources, :placeholders, :root_capability
101101

102-
def initialize(file_name)
102+
def initialize(bridge_name, file_name)
103103
@scheme_env = Scheme::Environment.new([], [], Scheme::GLOBAL_ENV)
104104
initialize_rosetta_primitives
105105
initialize_rosetta
106106
@suite_source = File.read(file_name)
107+
@bridge_name = bridge_name
107108

108109
@suite = nil
109110

@@ -116,6 +117,7 @@ def initialize(file_name)
116117

117118
def initialize_suite
118119
@suite = eval_scheme(@suite_source)
120+
suite_eval("(suite-set-bridge-name! the_suite bridge_name)", :bridge_name => @bridge_name)
119121
end
120122

121123
def eval_scheme(code, env = nil)
@@ -165,7 +167,8 @@ def initialize_rosetta_primitives
165167
"thread" => method(:rosetta_thread),
166168
"thread-wait-for-completion" => method(:rosetta_thread_join),
167169
"thread-sleep!" => method(:rosetta_thread_sleep),
168-
"thread-yield" => method(:rosetta_thread_yield)
170+
"thread-yield" => method(:rosetta_thread_yield),
171+
"rosetta-test-host" => lambda { "ruby" }
169172
}
170173

171174
primitives.each do |key, value|
@@ -252,8 +255,8 @@ def to_h
252255
end
253256
end
254257

255-
def suite(file_name, &block)
256-
obj = RosettaTestSuite.new(file_name)
258+
def suite(bridge_name, file_name, &block)
259+
obj = RosettaTestSuite.new(bridge_name, file_name)
257260
obj.instance_eval(&block)
258261
obj.run
259262
end

rosetta-test-rb/smtp.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "net/smtp"
44
require "openssl"
55

6-
suite "rosetta-test-suites/smtp.ros" do
6+
suite "stdlib smtp", "rosetta-test-suites/smtp.ros" do
77
only_capabilities "root.connection", "root.commands"
88

99
exclude_capabilities "root.commands.expn",

rosetta-test-rb/url_parsing.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "uri"
22
require_relative "rosetta"
33

4-
suite "rosetta-test-suites/url-parsing-rfc.ros" do
4+
suite "stdlib uri parsing", "rosetta-test-suites/url-parsing-rfc.ros" do
55
expected_failures :test_scheme_with_invalid_characters,
66
:"test_non-terminated_scheme",
77
:test_invalid_ipv4_host

0 commit comments

Comments
 (0)