PR4186 cont'd: uname -m --> uname -i in test cases

diff --git a/testsuite/systemtap.base/bz5274.exp b/testsuite/systemtap.base/bz5274.exp
index 2f76a43f138953f3732118d58493d3dad7c024af..9bb1f7c7456a7c32795ca6e1f75a2a486acbb340 100755 (executable)
--- 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 8824e6c4bf9cc8f7a1b47bc660be6d12e2fb9bad..3e1a519cae2007110041b825586c450bba3b20fd 100644 (file)
--- 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 4e0c7fc2ddfb3fa42854b1ce8542ab5f9954b855..1bc3e701df49ae64f6e73a923acb901095c8b51d 100644 (file)
--- 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 98ab305125f4c8633d0218d61df5181484676c93..8dc2a66306259d04f611cd4f7d232d5dd3944e07 100644 (file)
--- 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