listing_mode.exp: don't test Java probes if unsupported

If stap was not built with Java support, then we shouldn't test them.

diff --git a/testsuite/systemtap.base/listing_mode.exp b/testsuite/systemtap.base/listing_mode.exp
index ffad1a1f7b55b110df634863558f2a7383ab6e11..e2be2a88848b2de9eb09af0f57edb6997da82611 100644 (file)
--- a/testsuite/systemtap.base/listing_mode.exp
+++ b/testsuite/systemtap.base/listing_mode.exp
@@ -237,6 +237,16 @@ proc report_untested_probes {} {
    foreach probe_type $all_probe_types {
       switch $probe_type {
 
+         java(number).class(string).method(string) -
+         java(number).class(string).method(string).return -
+         java(string).class(string).method(string) -
+         java(string).class(string).method(string).return
+         {
+            if {![java_p]} {
+               setup_kfail JAVA *-*-*
+            }
+         }
+
          kernel.data(number).length(number).rw -
          kernel.data(number).length(number).write -
          kernel.data(number).rw -
@@ -413,21 +423,24 @@ stap_list {error(-1)}
 stap_list {error(0)}
 stap_list {error(1)}
 
-testing_probe {java(number).class(string).method(string)}
+if {[java_p]} {
+
+   testing_probe {java(number).class(string).method(string)}
 
-stap_list {java(123).class("MyClass").method("MyMethod")}
+   stap_list {java(123).class("MyClass").method("MyMethod")}
 
-testing_probe {java(number).class(string).method(string).return}
+   testing_probe {java(number).class(string).method(string).return}
 
-stap_list {java(123).class("MyClass").method("MyMethod").return}
+   stap_list {java(123).class("MyClass").method("MyMethod").return}
 
-testing_probe {java(string).class(string).method(string)}
+   testing_probe {java(string).class(string).method(string)}
 
-stap_list {java("JavaProc").class("MyClass").method("MyMethod")}
+   stap_list {java("JavaProc").class("MyClass").method("MyMethod")}
 
-testing_probe {java(string).class(string).method(string).return}
+   testing_probe {java(string).class(string).method(string).return}
 
-stap_list {java("JavaProc").class("MyClass").method("MyMethod").return}
+   stap_list {java("JavaProc").class("MyClass").method("MyMethod").return}
+}
 
 if {[hwbkpt_probes_p]} {