From be030da58adb64f8fe9b14d1f5bc8059b9cc19db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ka=C3=ADque=20Kandy=20Koga?= <kaiquekandykoga@gmail.com>
Date: Wed, 27 Oct 2021 16:11:22 -0300
Subject: [PATCH 1/3] Set ENV["TESTOPTS"] with "-v" when verbose is called.
 Doing that -v and --verbose options will work as expected

Assert ENV
---
 lib/rake/file_utils_ext.rb   | 1 +
 test/test_rake_file_utils.rb | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/lib/rake/file_utils_ext.rb b/lib/rake/file_utils_ext.rb
index 687d80584..7860b65ee 100644
--- a/lib/rake/file_utils_ext.rb
+++ b/lib/rake/file_utils_ext.rb
@@ -53,6 +53,7 @@ def #{name}(*args, **options, &block)
     def verbose(value=nil)
       oldvalue = FileUtilsExt.verbose_flag
       FileUtilsExt.verbose_flag = value unless value.nil?
+      ENV["TESTOPTS"] = "-v" if value
       if block_given?
         begin
           yield
diff --git a/test/test_rake_file_utils.rb b/test/test_rake_file_utils.rb
index 97b6ea83b..7a6ad14c9 100644
--- a/test/test_rake_file_utils.rb
+++ b/test/test_rake_file_utils.rb
@@ -12,6 +12,7 @@ def teardown
     FileUtils::LN_SUPPORTED[0] = true
     RakeFileUtils.verbose_flag = Rake::FileUtilsExt::DEFAULT
     ENV["RAKE_TEST_SH"] = @rake_test_sh
+    ENV["TESTOPTS"] = nil
 
     super
   end
@@ -106,8 +107,13 @@ def test_safe_ln_fails_on_script_error
   def test_verbose
     verbose true
     assert_equal true, verbose
+    assert_equal '-v', ENV['TESTOPTS']
+
+    ENV['TESTOPTS'] = nil
     verbose false
     assert_equal false, verbose
+    assert_equal nil, ENV['TESTOPTS']
+
     verbose(true) {
       assert_equal true, verbose
     }

From e293cc1d29b8808f7cd1c0b812b15d70c2021fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ka=C3=ADque=20Kandy=20Koga?= <kaiquekandykoga@gmail.com>
Date: Wed, 27 Oct 2021 16:13:43 -0300
Subject: [PATCH 2/3] Delete message which indicates the use of
 TESTOPTS="--verbose"

---
 lib/rake/testtask.rb         | 2 --
 test/test_rake_functional.rb | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
index 7cf1ece5d..29f546b51 100644
--- a/lib/rake/testtask.rb
+++ b/lib/rake/testtask.rb
@@ -109,8 +109,6 @@ def define
       desc @description
       task @name => Array(deps) do
         FileUtilsExt.verbose(@verbose) do
-          puts "Use TESTOPTS=\"--verbose\" to pass --verbose" \
-            ", etc. to runners." if ARGV.include? "--verbose"
           args =
             "#{ruby_opts_string} #{run_code} " +
             "#{file_list_string} #{option_list}"
diff --git a/test/test_rake_functional.rb b/test/test_rake_functional.rb
index 3854c5751..1298a3235 100644
--- a/test/test_rake_functional.rb
+++ b/test/test_rake_functional.rb
@@ -420,13 +420,6 @@ def test_test_task_when_verbose_unless_verbose_passed_not_prompt_testopts
     refute_match exp, @out
   end
 
-  def test_test_task_when_verbose_passed_prompts_testopts
-    rakefile_test_task
-    rake "--verbose", "unit"
-    exp = /TESTOPTS="--verbose" to pass --verbose/
-    assert_match exp, @out
-  end
-
   def test_comment_before_task_acts_like_desc
     rakefile_comments
 

From 2840414f5e13a361e82dfd22463c23b40a5c2637 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 6 Feb 2026 12:01:31 +0900
Subject: [PATCH 3/3] Run rubocop

---
 test/test_rake_file_utils.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_rake_file_utils.rb b/test/test_rake_file_utils.rb
index 7a6ad14c9..1eca1120e 100644
--- a/test/test_rake_file_utils.rb
+++ b/test/test_rake_file_utils.rb
@@ -107,12 +107,12 @@ def test_safe_ln_fails_on_script_error
   def test_verbose
     verbose true
     assert_equal true, verbose
-    assert_equal '-v', ENV['TESTOPTS']
+    assert_equal "-v", ENV["TESTOPTS"]
 
-    ENV['TESTOPTS'] = nil
+    ENV["TESTOPTS"] = nil
     verbose false
     assert_equal false, verbose
-    assert_equal nil, ENV['TESTOPTS']
+    assert_equal nil, ENV["TESTOPTS"]
 
     verbose(true) {
       assert_equal true, verbose