Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1
ltrace
ltrace.trunk-r54.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File ltrace.trunk-r54.patch of Package ltrace
------------------------------------------------------------------------ r54 | ianw-guest | 2006-08-07 02:10:22 +0000 (Mon, 07 Aug 2006) | 2 lines Changed paths: M /ltrace/trunk/ChangeLog M /ltrace/trunk/testsuite/lib/ltrace.exp M /ltrace/trunk/testsuite/ltrace.minor/count-record.exp rejig testcase grepping ------------------------------------------------------------------------ --- ChangeLog | 5 +++++ testsuite/lib/ltrace.exp | 8 +++++--- testsuite/ltrace.minor/count-record.exp | 26 +++++++++++++------------- 3 files changed, 23 insertions(+), 16 deletions(-) Index: ChangeLog =================================================================== --- ChangeLog.orig +++ ChangeLog @@ -1,3 +1,8 @@ +2006-07-20 Steve Fink <sphink@gmail.com> + + * testsuite/lib/ltrace.exp: better quoting and error detection for + ltrace_verify_output's call to grep + 2006-08-07 Steve Fink <sphink@gmail.com> * ltrace.1: update bug email addr Index: testsuite/lib/ltrace.exp =================================================================== --- testsuite/lib/ltrace.exp.orig +++ testsuite/lib/ltrace.exp @@ -260,10 +260,12 @@ proc ltrace_saveoutput { args } { proc ltrace_verify_output { file_to_search pattern {instance_no 0}} { # compute the number of PATTERN in FILE_TO_SEARCH by grep and wc. - catch "exec sh -c {grep $pattern $file_to_search | wc -l ;exit}" output + catch "exec sh -c {grep \"$pattern\" $file_to_search | wc -l ;exit}" output verbose "output = $output" - - if { $instance_no == 0 } then { + + if [ regexp "syntax error" $output ] then { + fail "Invalid regular expression $pattern" + } elseif { $instance_no == 0 } then { if { $output == 0 } then { fail "Fail to find $pattern in $file_to_search" } else { Index: testsuite/ltrace.minor/count-record.exp =================================================================== --- testsuite/ltrace.minor/count-record.exp.orig +++ testsuite/ltrace.minor/count-record.exp @@ -48,30 +48,30 @@ ltrace_saveoutput $exec_output $srcdir/$ # 3.39 0.000268 268 1 fread # -set pattern "\'1 rmdir\'" +set pattern " 1 rmdir" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 fopen\'" +set pattern " 1 fopen" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'2 remove\'" +set pattern " 2 remove" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 mkdir\'" +set pattern " 1 mkdir" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 fseek\'" +set pattern " 1 fseek" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 fwrite\'" +set pattern " 1 fwrite" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 fclose\'" +set pattern " 1 fclose" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 rename\'" +set pattern " 1 rename" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 symlink\'" +set pattern " 1 symlink" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 chdir\'" +set pattern " 1 chdir" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 access\'" +set pattern " 1 access" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 getcwd\'" +set pattern " 1 getcwd" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern -set pattern "\'1 fread\'" +set pattern " 1 fread" ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor