diff options
| -rw-r--r-- | testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | testsuite/lib/stap_run.exp | 2 | ||||
| -rw-r--r-- | testsuite/lib/stap_run2.exp | 5 | ||||
| -rw-r--r-- | testsuite/lib/stap_run_binary.exp | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 219c01da..3bca1e4c 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2006-08-21 Martin Hunt <hunt@redhat.com> + + * lib/stap_run.exp: Check for existence of installtest_p + before running it. This reenables running individual tests + with runtest. + * lib/stap_run2.exp: Ditto. + * lib/stap_run_binary.exp: Ditto. + 2006-08-12 Frank Ch. Eigler <fche@elastic.org> * Makefile.am (clean-local): Clean up dejagnu turds. diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index d230e8e5..2d378154 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -14,7 +14,7 @@ # returns 1 if there was a problem # Additional arguments are passed to stap as-is. proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } { - if {![installtest_p]} { untested $TEST_NAME; return } + if {[info procs installtest_p] != "" && ![installtest_p]} { untested $TEST_NAME; return } set cmd [concat {stap -v} $args] if [file readable $TEST_NAME] { diff --git a/testsuite/lib/stap_run2.exp b/testsuite/lib/stap_run2.exp index a182a2c5..ebda0d6d 100644 --- a/testsuite/lib/stap_run2.exp +++ b/testsuite/lib/stap_run2.exp @@ -1,8 +1,7 @@ # stap_run2.exp # # Simple script for testing multiple lines of exact output. - - + # stap_run2 TEST_NAME # TEST_NAME is path to the current test # Additional arguments are passed to stap as-is. @@ -12,7 +11,7 @@ set timeout 20 proc stap_run2 { TEST_NAME args } { - if {![installtest_p]} { untested $TEST_NAME; return } + if {[info procs installtest_p] != "" && ![installtest_p]} { untested $TEST_NAME; return } # fix up expected string regsub -all \n $::result_string \r\n output diff --git a/testsuite/lib/stap_run_binary.exp b/testsuite/lib/stap_run_binary.exp index 6d5de4b8..f29e8f35 100644 --- a/testsuite/lib/stap_run_binary.exp +++ b/testsuite/lib/stap_run_binary.exp @@ -6,7 +6,7 @@ # global result_string must be set to the expected output proc stap_run_binary { TEST_NAME} { - if {![installtest_p]} { untested $TEST_NAME; return } + if {[info procs installtest_p] != "" && ![installtest_p]} {untested $TEST_NAME; return} set hex_args {-ve 8/1 "%02x " "\n"} set res [exec stap $TEST_NAME | hexdump $hex_args] |