From 081e9217c8d0cbe1f5fecb78726e7b7e1f3f6cec Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Fri, 25 Apr 2014 12:01:52 -0400
Subject: [PATCH] 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
---
 testsuite/systemtap.base/callee.exp             | 12 ++++++++++++
 testsuite/systemtap.base/dump_functions.exp     |  4 ++--
 testsuite/systemtap.base/dump_probe_aliases.exp |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/testsuite/systemtap.base/callee.exp b/testsuite/systemtap.base/callee.exp
index a8bfd14ec..1228a201e 100644
--- 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 fef8c6d00..a69891fde 100644
--- 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 b83f661ce..8d0ce9bab 100644
--- 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 {
-- 
2.43.5