diff options
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.syscall/syscall.exp | 46 |
2 files changed, 33 insertions, 18 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 34b9dfdf..ce7deaa1 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-05-08 Will Cohen <wcohen@redhat.com> + PR4470 + * testsuite/systemtap.syscall/syscall.exp: Build correct sizes for + 32-bit and 64-bit machines. + 2007-05-07 Martin Hunt <hunt@redhat.com> PR4466 * systemtap.samples/system_func.stp: Rewrite test to account diff --git a/testsuite/systemtap.syscall/syscall.exp b/testsuite/systemtap.syscall/syscall.exp index 3e799933..3fa98718 100644 --- a/testsuite/systemtap.syscall/syscall.exp +++ b/testsuite/systemtap.syscall/syscall.exp @@ -15,10 +15,13 @@ proc test_procedure {} { set do_64_bit_pass 0 if {$::tcl_platform(machine) == "x86_64" || $::tcl_platform(machine) == "ppc64" || $::tcl_platform(machine) == "s390x" } { set do_64_bit_pass 1 + set flags "additional_flags=-m64" + } + if { $::tcl_platform(machine) == "ia64" } { + set do_64_bit_pass 1 } if {$do_64_bit_pass} { - set flags "additional_flags=-m64" foreach filename [lsort [glob $pattern]] { set file [file tail [string range $filename 0 end-2]] if {![installtest_p]} { untested $file; continue } @@ -36,29 +39,36 @@ proc test_procedure {} { catch {exec rm -f $wd/$file} } } + + set do_32_bit_pass 1 + set flags "additional_flags=-m32" + # add any 64-bit only machines to this statement + if { $::tcl_platform(machine) == "ia64" } { + set do_32_bit_pass 0 + } if { $::tcl_platform(machine) == "s390x" } { set flags "additional_flags=-m31" - } else { - set flags "additional_flags=-m32" } - foreach filename [lsort [glob $pattern]] { - set file [file tail [string range $filename 0 end-2]] - if {![installtest_p]} { untested $file; continue } - target_compile $filename $wd/$file executable $flags - send_log "Testing 32-bit ${file}\n" - set res [exec $srcdir/$subdir/test.tcl $file $filename] - if {$res == "PASS"} { - pass "32-bit $file" - } elseif {$res == "UNSUPP"} { - unsupported "$file not supported on this arch" - } else { - fail "32-bit $file" - send_log "$res\n" + if {$do_32_bit_pass} { + foreach filename [lsort [glob $pattern]] { + set file [file tail [string range $filename 0 end-2]] + if {![installtest_p]} { untested $file; continue } + target_compile $filename $wd/$file executable $flags + send_log "Testing 32-bit ${file}\n" + set res [exec $srcdir/$subdir/test.tcl $file $filename] + if {$res == "PASS"} { + pass "32-bit $file" + } elseif {$res == "UNSUPP"} { + unsupported "$file not supported on this arch" + } else { + fail "32-bit $file" + send_log "$res\n" + } + catch {exec rm -f $wd/$file} } - catch {exec rm -f $wd/$file} - } + } } set timeout 600 |