From 8ede84aa95af3b196f051fa96c4bb1164f6ffbbb Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Mon, 8 Jul 2024 09:31:45 +0900 Subject: [PATCH] Move the file location of launchable.rb --- bootstraptest/runner.rb | 2 +- tool/lib/{test/unit => }/launchable.rb | 0 tool/lib/test/unit.rb | 2 +- tool/test/testunit/test_launchable.rb | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename tool/lib/{test/unit => }/launchable.rb (100%) 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 similarity index 100% rename from tool/lib/test/unit/launchable.rb rename to 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