make "-p4 -m FOO" mode consistent with ordinary -p4

4 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 099e42e9..8adea26b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-13  Frank Ch. Eigler  <fche@elastic.org>
+
+	* main.cxx (main): Print generated module name for "-m FOO"
+	runs also.  Stop warning about this implying uncached operation.
+
 2008-06-12  Stan Cox  <scox@redhat.com>
 
 	* elaborate.cxx (print_warning): Make parameter a const.
diff --git a/main.cxx b/main.cxx
index bba27e31..58d7fa9f 100644
--- a/main.cxx
+++ b/main.cxx
@@ -499,7 +499,6 @@ main (int argc, char * const argv [])
 	      }
 	  }
 
-	  cerr << "Warning: using '-m' disables cache support." << endl;
 	  s.use_cache = false;
           break;
 
@@ -972,7 +971,10 @@ main (int argc, char * const argv [])
   rc = compile_pass (s);
 
   if (rc == 0 && s.last_pass == 4)
-    cout << s.hash_path << endl;
+    {
+      cout << ((s.hash_path == "") ? (s.module_name + string(".ko")) : s.hash_path);
+      cout << endl;
+    }
 
   times (& tms_after);
   gettimeofday (&tv_after, NULL);
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 9fe8b8e3..518dc4f1 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-13  Frank Ch. Eigler  <fche@elastic.org>
+
+	* lib/stap_run.exp: Remove module/cache warning boilerplate.
+
 2008-06-11  Mark Wielaard  <mwielaard@redhat.com>
 
 	* systemtap.base/warnings.exp: Expect 11 warning plus 1 .ko output
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp
index 42efa4f8..43964d8e 100644
--- a/testsuite/lib/stap_run.exp
+++ b/testsuite/lib/stap_run.exp
@@ -33,7 +33,6 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args }
     eval spawn $cmd
     expect {
 	-timeout 180
-	-re {^Warning: using '-m' disables cache support.\r\n} {exp_continue}
 	-re {^WARNING: cannot find module [^\r]*DWARF[^\r]*\r\n} {exp_continue}
 	-re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n}
 	{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue}