X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftracemunch;h=0e05aaee58d189d52723e30ad06d947148c68461;hp=cdb91bc83560fc19ba3619091791f3c8cd1c9e1d;hb=61d8ae54ff6acd69e9dab2afb21591d44c46ee1f;hpb=ed8a29294ebe0c24db40d32e9a4e0268afb6529d diff --git a/test/tracemunch b/test/tracemunch index cdb91bc8..0e05aaee 100755 --- a/test/tracemunch +++ b/test/tracemunch @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tracemunch,v 1.19 2018/04/07 20:37:08 tom Exp $ +# $Id: tracemunch,v 1.20 2018/05/02 00:14:29 tom Exp $ ############################################################################## # Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. # # # @@ -37,9 +37,10 @@ use strict; use warnings; our $putattr = - "PutAttrChar\\({{ '(.)' = 0[0-7]+ }}\\) at \\(([0-9]+), ([0-9]+)\\)"; + 'PutAttrChar\(\{\{ ' . "'(.)'" + . ' = 0[0-7]+ \}\}\) at \(([0-9]+), ([0-9]+)\)'; our $waddnstr = - "waddnstr\\(0x([[:xdigit:]]+),\"([^\"]+)\",[0-9]+\\) called {A_NORMAL}"; + 'waddnstr\(0x([[:xdigit:]]+),"([^\"]+)",[0-9]+\) called \{A_NORMAL\}'; our $scr_nums = 0; our $thr_nums = 0; @@ -107,7 +108,7 @@ while () { $awaiting = "curscr" if ( $_ =~ /creating curscr/ ); $awaiting = "newscr" if ( $_ =~ /creating newscr/ ); $awaiting = "stdscr" if ( $_ =~ /creating stdscr/ ); - $awaiting = "screen" if ( $_ =~ /^(\+ )*called {new_prescr\(\)/ ); + $awaiting = "screen" if ( $_ =~ /^(\+ )*called \{new_prescr\(\)/ ); if ( $_ =~ /^create :window 0x([[:xdigit:]]+)/ ) { $addr = "0x$1"; if ( $awaiting eq "curscr" ) { @@ -124,7 +125,7 @@ while () { } $awaiting = ""; } - elsif ( $_ =~ /^(\+ )*called {_nc_add_to_try\((0x[[:xdigit:]]+),/ ) { + elsif ( $_ =~ /^(\+ )*called \{_nc_add_to_try\((0x[[:xdigit:]]+),/ ) { $try_addr{$2} = ++$try_nums unless defined $try_addr{$2}; } elsif ( $_ =~ /^(\+ )*_nc_alloc_screen_sp 0x([[:xdigit:]]+)/ ) {