Set staprun's verbosity one less than stap

Prior to commit e520ea8, staprun would get one -v for s.verbosity>1 and
a second -v for s.verbosity>2.  That commit unbounded the number of -v
for staprun, but changed the off-by-one, and staprun and stapio are too
chatty for that.

This also now sets stapdyn verbosity the same way.

* buildrun.cxx (make_run_command): Give one less -v flag.
  (make_dyninst_run_command): Set stapdyn -v flags the same way.

diff --git a/buildrun.cxx b/buildrun.cxx
index 1b068518e7adc02fbc4c0ff4682822bc74db1e77..f982f2a810c9c490b358c14340644ea4cc311f0c 100644 (file)
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -628,9 +628,9 @@ make_dyninst_run_command (systemtap_session& s, const string& remotedir,
 {
   vector<string> cmd;
   cmd.push_back(getenv("SYSTEMTAP_STAPDYN") ?: BINDIR "/stapdyn");
-  if (s.verbose > 1)
-    cmd.push_back("-v");
-  if (s.verbose > 2)
+
+  // use slightly less verbosity
+  for (unsigned i=1; i<s.verbose; i++)
     cmd.push_back("-v");
   if (s.suppress_warnings)
     cmd.push_back("-w");
@@ -657,7 +657,9 @@ make_run_command (systemtap_session& s, const string& remotedir,
   // for now, just spawn staprun
   vector<string> staprun_cmd;
   staprun_cmd.push_back(getenv("SYSTEMTAP_STAPRUN") ?: BINDIR "/staprun");
-  for (unsigned i=0; i<s.verbose; i++)
+
+  // use slightly less verbosity
+  for (unsigned i=1; i<s.verbose; i++)
     staprun_cmd.push_back("-v");
   if (s.suppress_warnings)
     staprun_cmd.push_back("-w");