Merge pull request #2350 from taminob/bugfix/2342/remove-no-work-to-d…

…o-output-with-quiet Do not print 'no work to do' with --quiet
ninja-build · Nov 1, 2023 · 2a2e470 · 2a2e470
2 parents b60a7dd + 1111da8
commit 2a2e470
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/misc/output_test.py b/misc/output_test.py
@@ -133,6 +133,7 @@ def test_pr_1685(self):
     def test_status(self):
         self.assertEqual(run(''), 'ninja: no work to do.\n')
         self.assertEqual(run('', pipe=True), 'ninja: no work to do.\n')
+        self.assertEqual(run('', flags='--quiet'), '')
 
     def test_ninja_status_default(self):
         'Do we show the default status by default?'

diff --git a/src/ninja.cc b/src/ninja.cc
@@ -1366,7 +1366,9 @@ int NinjaMain::RunBuild(int argc, char** argv, Status* status) {
   disk_interface_.AllowStatCache(false);
 
   if (builder.AlreadyUpToDate()) {
-    status->Info("no work to do.");
+    if (config_.verbosity != BuildConfig::NO_STATUS_UPDATE) {
+      status->Info("no work to do.");
+    }
     return 0;
   }