From 0facf3509ae93f77d9efc6841731f7ff98982630 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Mon, 24 Aug 2009 19:42:28 -0400
Subject: PR4186 cont'd: uname -m  -->  uname -i in test cases

---
 testsuite/systemtap.base/bz5274.exp       | 2 +-
 testsuite/systemtap.base/cmd_parse.exp    | 2 +-
 testsuite/systemtap.base/preprocessor.exp | 2 +-
 testsuite/systemtap.base/x86_gs.exp       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/bz5274.exp b/testsuite/systemtap.base/bz5274.exp
index 2f76a43f..9bb1f7c7 100755
--- a/testsuite/systemtap.base/bz5274.exp
+++ b/testsuite/systemtap.base/bz5274.exp
@@ -1,6 +1,6 @@
 set test "./bz5274"
 set tpath "$srcdir/$subdir/$test"
-set arch [exec uname -m]
+set arch [exec uname -i]
 
 if {$arch == "ppc64"} {
 	catch {exec gcc -o $test -g -m64 $srcdir/$subdir/$test.c} err
diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
index 8824e6c4..3e1a519c 100644
--- a/testsuite/systemtap.base/cmd_parse.exp
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -141,7 +141,7 @@ expect {
 }
 wait;catch {close}
 
-set uname [exec uname -m]
+set uname [exec uname -i]
 spawn sh -c "stap -m do_not_cache_me -a $uname -p4 -e 'probe begin {exit()}'"
 # the \r below is meant to match the "kernelrelease" output, as distinct from
 # any possible auxiliary make verbosity.
diff --git a/testsuite/systemtap.base/preprocessor.exp b/testsuite/systemtap.base/preprocessor.exp
index 4e0c7fc2..1bc3e701 100644
--- a/testsuite/systemtap.base/preprocessor.exp
+++ b/testsuite/systemtap.base/preprocessor.exp
@@ -6,7 +6,7 @@ set kr {2?[0-9]*}
 # a pattern bound to mismatch
 set krx {?noSuchKernel*}
 
-set arch [exec uname -m]
+set arch [exec uname -i]
 set ar "?[string range $arch 1 end-1]?"
 set arx {?noSuchArch?}
 
diff --git a/testsuite/systemtap.base/x86_gs.exp b/testsuite/systemtap.base/x86_gs.exp
index 98ab3051..8dc2a663 100644
--- a/testsuite/systemtap.base/x86_gs.exp
+++ b/testsuite/systemtap.base/x86_gs.exp
@@ -1,7 +1,7 @@
 set test "x86_gs"
 if {![installtest_p]} { untested $test; return }
-set arch [exec uname -m]
-if {$arch!="i686"} { untested $test; return }
+set arch [exec uname -i]
+if {$arch!="i386"} { untested $test; return }
 spawn stap $srcdir/$subdir/x86_gs.stp
 expect {
     -timeout 60
-- 
cgit