summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-05-15 11:44:42 +0200
committerMark Wielaard <mjw@redhat.com>2009-05-15 11:44:42 +0200
commitdad0fddfb82f22bb384fa2f0043cbb70e51f4a1e (patch)
treeda2b0f3142b040ec438d292d80629bfe2568ee25
parentba66469ee107a98d95345a6d6d71cd5bb5831cdc (diff)
downloadsystemtap-steved-dad0fddfb82f22bb384fa2f0043cbb70e51f4a1e.tar.gz
systemtap-steved-dad0fddfb82f22bb384fa2f0043cbb70e51f4a1e.tar.xz
systemtap-steved-dad0fddfb82f22bb384fa2f0043cbb70e51f4a1e.zip
flightrec3.exp uses cpus as array, so rename skipped.exp cpus var to nr_cpus.
Works around a make installcheck issue that resulted in skipped.exp failing because of "ERROR: can't set "cpus": variable is array" * testsuite/systemtap.base/skipped.exp: Renamed cpus variable to nr_cpus.
-rw-r--r--testsuite/systemtap.base/skipped.exp6
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/systemtap.base/skipped.exp b/testsuite/systemtap.base/skipped.exp
index 8c491037..f3048c8a 100644
--- a/testsuite/systemtap.base/skipped.exp
+++ b/testsuite/systemtap.base/skipped.exp
@@ -2,8 +2,8 @@ set test "skip tracking"
if {! [installtest_p]} { untested $test; return }
-set cpus [exec sh -c "grep ^processor /proc/cpuinfo | wc -l"]
-if {$cpus < 2} { unsupported $test; return }
+set nr_cpus [exec sh -c "grep ^processor /proc/cpuinfo | wc -l"]
+if {$nr_cpus < 2} { unsupported $test; return }
set ok 0
spawn stap -e "probe timer.s(5) {exit()} probe timer.profile,syscall.* {f++} global f" -DMAXTRYLOCK=0 -tu
@@ -18,4 +18,4 @@ expect {
catch {close}
catch {wait}
-if {$ok >= 3} { pass "$test ($cpus $ok)" } else { fail "$test ($cpus $ok)" }
+if {$ok >= 3} { pass "$test ($nr_cpus $ok)" } else { fail "$test ($nr_cpus $ok)" }