diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-08-25 11:54:15 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-08-25 12:31:14 -0400 |
| commit | d27e6fd532200873fe8cc23a155360114fe26110 (patch) | |
| tree | cb3644c25555116bcf3070251cb89362ffee3d8c /testsuite | |
| parent | f0a68636d44065dfd60e685924b82e95195c0f9f (diff) | |
| download | systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.tar.gz systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.tar.xz systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.zip | |
PR4186 cont'd: option #2: standardize on kernel ARCH/SUBARCH throughout
* main.cxx (main): Perform equivalent sed by hand on uname()->machine.
* stap.1.in: Clarify -a ARCH slightly.
* tapsets.cxx (validate_module_elf): Accept "arm*"for EM_ARM.
* tapset/**, testsuite/**: Removed/collapsed "i386"/"i686" branches,
renamed "ppc64"->"powerpc" and "s390x"->"s390".
Diffstat (limited to 'testsuite')
| -rwxr-xr-x | testsuite/parseok/fourteen.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/utrace_syscall_args.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.context/num_args.stp | 9 | ||||
| -rw-r--r-- | testsuite/systemtap.stress/current.stp | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/testsuite/parseok/fourteen.stp b/testsuite/parseok/fourteen.stp index 30ada648..bdd31469 100755 --- a/testsuite/parseok/fourteen.stp +++ b/testsuite/parseok/fourteen.stp @@ -11,7 +11,7 @@ global global %( arch == "i386" %? i386 -%: %( arch == "i686" %? i686 +%: %( arch == "powerpc" %? powerpc %: %( arch != "x86_64" %? other %: x86_64 %) %) %) diff --git a/testsuite/systemtap.base/utrace_syscall_args.stp b/testsuite/systemtap.base/utrace_syscall_args.stp index 5c6ca451..267b7331 100644 --- a/testsuite/systemtap.base/utrace_syscall_args.stp +++ b/testsuite/systemtap.base/utrace_syscall_args.stp @@ -59,7 +59,7 @@ probe process("utrace_syscall_args").syscall { mmap_args[5] = $arg5 mmap_args[6] = $arg6 -%(arch == "s390x" %? +%(arch == "s390" %? # s390 requires this for mmap. Verified by running: # # strace strace utrace_syscall_args addr = mmap_args[1] diff --git a/testsuite/systemtap.context/num_args.stp b/testsuite/systemtap.context/num_args.stp index 5cc01d52..c6638f2a 100644 --- a/testsuite/systemtap.context/num_args.stp +++ b/testsuite/systemtap.context/num_args.stp @@ -1,8 +1,7 @@ %( arch == "i386" %? global ir = "eax", lr = "eax" %) -%( arch == "i686" %? global ir = "eax", lr = "eax" %) %( arch == "x86_64" %? global ir = "eax", lr = "rax" %) -%( arch == "ppc64" %? global ir = "r3", lr = "r3" %) -%( arch == "s390x" %? global ir = "r2", lr = "r2" %) +%( arch == "powerpc" %? global ir = "r3", lr = "r3" %) +%( arch == "s390" %? global ir = "r2", lr = "r2" %) probe module("systemtap_test_module2").function("yyy_int") { printf("yyy_int %d %d %d\n", int_arg(1), int_arg(2), int_arg(3)) @@ -28,9 +27,7 @@ probe module("systemtap_test_module2").function("yyy_int64") { # and the stack, but rather passed entirely on the stack. printf("yyy_int64 %d %d %d\n", %( arch == "i386" %? s64_arg(1), s64_arg(4), s64_arg(6) -%: %( arch == "i686" %? s64_arg(1), s64_arg(4), s64_arg(6) - %: s64_arg(1), s64_arg(2), s64_arg(3) - %) +%: s64_arg(1), s64_arg(2), s64_arg(3) %) ) } diff --git a/testsuite/systemtap.stress/current.stp b/testsuite/systemtap.stress/current.stp index 4c0f824c..0b2a7f94 100644 --- a/testsuite/systemtap.stress/current.stp +++ b/testsuite/systemtap.stress/current.stp @@ -24,7 +24,7 @@ probe %( arch != "x86_64" %? # __switch_to can not be probed on x86_64 - see PR2068 kernel.function("__switch_to").call, - %( arch != "i686" %? + %( arch != "i386" %? # __switch_to.return is broken on i686 - see PR4542 kernel.function("__switch_to").return, %) |