summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaoto Ono <[email protected]>2024-07-08 09:31:45 +0900
committerHiroshi SHIBATA <[email protected]>2024-07-08 10:15:04 +0900
commit8ede84aa95af3b196f051fa96c4bb1164f6ffbbb (patch)
tree1dfd296e86a47b03e3e6bb1bf58e3ae6fce3d4b1
parent5b7892545542c0d451cb1e14a1d85474ac46b537 (diff)
Move the file location of launchable.rb
-rwxr-xr-xbootstraptest/runner.rb2
-rw-r--r--tool/lib/launchable.rb (renamed from tool/lib/test/unit/launchable.rb)0
-rw-r--r--tool/lib/test/unit.rb2
-rw-r--r--tool/test/testunit/test_launchable.rb2
4 files changed, 3 insertions, 3 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 70805c3523..c0638ffc9a 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -236,7 +236,7 @@ End
return true
end
- require_relative '../tool/lib/test/unit/launchable'
+ require_relative '../tool/lib/launchable'
BT.launchable_test_reports = writer = Launchable::JsonStreamWriter.new($1)
writer.write_array('testCases')
at_exit {
diff --git a/tool/lib/test/unit/launchable.rb b/tool/lib/launchable.rb
index 38f4fe92b3..38f4fe92b3 100644
--- a/tool/lib/test/unit/launchable.rb
+++ b/tool/lib/launchable.rb
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 0d32abd18a..be619e1445 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -1450,7 +1450,7 @@ module Test
def setup_options(opts, options)
super
opts.on_tail '--launchable-test-reports=PATH', String, 'Report test results in Launchable JSON format' do |path|
- require_relative '../test/unit/launchable'
+ require_relative '../launchable'
options[:launchable_test_reports] = writer = Launchable::JsonStreamWriter.new(path)
writer.write_array('testCases')
main_pid = Process.pid
diff --git a/tool/test/testunit/test_launchable.rb b/tool/test/testunit/test_launchable.rb
index 3d3c5c29de..76be876456 100644
--- a/tool/test/testunit/test_launchable.rb
+++ b/tool/test/testunit/test_launchable.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require 'tempfile'
require 'json'
-require_relative '../../lib/test/unit/launchable'
+require_relative '../../lib/launchable'
class TestLaunchable < Test::Unit::TestCase
def test_json_stream_writer