← Back to branch summary

~ubuntu-branches/ubuntu/natty/ltrace/natty

« back to all changes in this revision

Viewing changes to testsuite/lib/ltrace.exp

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar, Colin Watson
  • Date: 2009-01-06 17:46:28 UTC
  • mfrom: (1.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090106174628-pt1541aq1ykev7m1
Tags: 0.5.1-2ubuntu1
[ Bhavani Shankar ]
* Merge from debian unstable, remaining changes: LP: #313530
  - Add lpia to architecture list.
  - Use libelf-dev instead of libelfg0-dev
  - Define _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE in debian/rules CFLAGS.
    The configure script has a bug where it can't properly cope with the need
    to define these before detecting the use of elfutils.

[ Colin Watson ]
* Remove stray dpatch build-dependency.
* Change libelfg0-dev to libelf-dev in debian/control.in as well as in
  debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
testsuite/lib/ltrace.exp
260
260
proc ltrace_verify_output { file_to_search pattern {instance_no 0}} {
261
261
 
262
262
        # compute the number of PATTERN in FILE_TO_SEARCH by grep and wc.
263
 
        catch "exec sh -c {grep $pattern $file_to_search | wc -l ;exit}" output
 
263
        catch "exec sh -c {grep \"$pattern\" $file_to_search | wc -l ;exit}" output
264
264
        verbose "output = $output"
265
 
        
266
 
        if { $instance_no == 0 } then {
 
265
 
 
266
        if [ regexp "syntax error" $output ] then {
 
267
                fail "Invalid regular expression $pattern"
 
268
        } elseif { $instance_no == 0 } then {
267
269
                if { $output == 0 } then {
268
270
                        fail "Fail to find $pattern in $file_to_search"
269
271
                } else {