PR7035: don't suppress all error messages during listings mode

3 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c607db0f..2875ed6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-27  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR 7036
+	From Wenji Huang <wenji.huang@oracle.com>:
+	* elaborate.cxx (print_error): Don't suppress if listings_mode.
+	* main.cxx (main): Suppress "pass N failed" if listings_mode.
+
 2008-11-26  Stan Cox  <scox@redhat.com>
 
 	* tapsets.cxx (dwarf_builder::build): Support debuginfo static uprobes.
diff --git a/elaborate.cxx b/elaborate.cxx
index 7cbac31f..0dd80626 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -1446,9 +1446,6 @@ systemtap_session::print_error (const semantic_error& e)
   string message_str[2];
   string align_semantic_error ("        ");
 
-  // NB: we don't print error messages during listing mode.
-  if (listing_mode) return;
-
   // We generate two messages.  The second one ([1]) is printed
   // without token compression, for purposes of duplicate elimination.
   // This way, the same message that may be generated once with a
diff --git a/main.cxx b/main.cxx
index 0cc47804..91c20ddb 100644
--- a/main.cxx
+++ b/main.cxx
@@ -939,7 +939,7 @@ main (int argc, char * const argv [])
            << endl;
     }
 
-  if (rc)
+  if (rc && !s.listing_mode)
     cerr << "Pass 1: parse failed.  "
          << "Try again with another '--vp 1' option."
          << endl;
@@ -967,7 +967,7 @@ main (int argc, char * const argv [])
                       << TIMESPRINT
                       << endl;
 
-  if (rc)
+  if (rc && !s.listing_mode)
     cerr << "Pass 2: analysis failed.  "
          << "Try again with another '--vp 01' option."
          << endl;