testsuite: adapt to RHEL5

- callee.exp: set as untested if GCC or elfutils too old
- dump_functions.exp: RHEL5 exec doesn't support -ignorestderr
- dump_probe_aliases.exp: ditto

diff --git a/testsuite/systemtap.base/callee.exp b/testsuite/systemtap.base/callee.exp
index a8bfd14ec708f84b9c9adb49a435310e0e81a7c9..1228a201e034da611fa12955148dcc7d57a30f5c 100644 (file)
--- a/testsuite/systemtap.base/callee.exp
+++ b/testsuite/systemtap.base/callee.exp
@@ -4,6 +4,18 @@ set testpath "$srcdir/$subdir"
 # The purpose of this testcase is to verify that .callee[s] probes function
 # properly in a variety of situations.
 
+# Requires GCC v4.7 and stap compiled with elfutils 0.153
+if {[strverscmp $GCC_Version 4.7] < 0} {
+   verbose -log "skipping $test.exp: GCC too old ($GCC_Version vs. 4.7)"
+   untested $test
+   return
+}
+if {[strverscmp $ELF_Version 0.153] < 0} {
+   verbose -log "skipping $test.exp: elfutils too old ($ELF_Version vs. 0.153)"
+   untested $test
+   return
+}
+
 # We move on to other subtests if a subtest fails, but within subtests, we fail
 # the whole subtest if a subsubtest fails. Hope that makes sense.
 

diff --git a/testsuite/systemtap.base/dump_functions.exp b/testsuite/systemtap.base/dump_functions.exp
index fef8c6d00b77c4dcbb882f82b2f61f38981956e2..a69891fdea448d288395794ff4ae49014c06e789 100644 (file)
--- a/testsuite/systemtap.base/dump_functions.exp
+++ b/testsuite/systemtap.base/dump_functions.exp
@@ -22,7 +22,7 @@ proc has_function { output wanted func } {
 }
 
 # Get output for --dump-functions
-if {[catch {exec -ignorestderr stap --dump-functions 2>/dev/null} output]} {
+if {[catch {exec stap --dump-functions 2>/dev/null} output]} {
    fail "$test (can't get output of stap --dump-functions)"
    return
 } else {
@@ -30,7 +30,7 @@ if {[catch {exec -ignorestderr stap --dump-functions 2>/dev/null} output]} {
 }
 
 # Get output for -v --dump-functions
-if {[catch {exec -ignorestderr stap -v --dump-functions 2>/dev/null} outputv]} {
+if {[catch {exec stap -v --dump-functions 2>/dev/null} outputv]} {
    fail "$test (can't get output of stap -v --dump-functions)"
    return
 } else {

diff --git a/testsuite/systemtap.base/dump_probe_aliases.exp b/testsuite/systemtap.base/dump_probe_aliases.exp
index b83f661ced392bec7b4726cbec04a184c789b7bf..8d0ce9bab88a966ed4fb6cd6498b88d9c2023dd9 100644 (file)
--- a/testsuite/systemtap.base/dump_probe_aliases.exp
+++ b/testsuite/systemtap.base/dump_probe_aliases.exp
@@ -17,7 +17,7 @@ proc has_alias { output wanted alias } {
 }
 
 # Get output for --dump-probe-aliases
-if {[catch {exec -ignorestderr stap --dump-probe-aliases 2>/dev/null} output]} {
+if {[catch {exec stap --dump-probe-aliases 2>/dev/null} output]} {
    fail "$test (can't get output of stap --dump-probe-aliases)"
    return
 } else {
@@ -25,7 +25,7 @@ if {[catch {exec -ignorestderr stap --dump-probe-aliases 2>/dev/null} output]} {
 }
 
 # Get output for -v --dump-probe-aliases
-if {[catch {exec -ignorestderr stap -v --dump-probe-aliases 2>/dev/null} outputv]} {
+if {[catch {exec stap -v --dump-probe-aliases 2>/dev/null} outputv]} {
    fail "$test (can't get output of stap -v --dump-probe-aliases)"
    return
 } else {