diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-15 21:07:04 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-15 21:07:04 -0800 |
commit | f47dcadfd8b50e97b51c05b72f19063b39686a7c (patch) | |
tree | 5b05ef12c1d674d841b45cfa65dae415b7e9449f /util | |
parent | ce4aba3e54eb69b0902c75de2db1810ed7dcfe6b (diff) | |
parent | 2cd5e980d2e7b33d61b5a5639784b424fa74142a (diff) | |
download | gem5-f47dcadfd8b50e97b51c05b72f19063b39686a7c.tar.xz |
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : dd887635c7ce74324b3670744461ffdf92e1dedf
Diffstat (limited to 'util')
-rwxr-xr-x | util/rundiff | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/util/rundiff b/util/rundiff index 05beba84b..63c05b96b 100755 --- a/util/rundiff +++ b/util/rundiff @@ -191,7 +191,10 @@ sub printdiff DISCARD_A => \&discard1, DISCARD_B => \&discard2 }); - die "Lost sync!" if (!$match_found); + if (!$match_found) { + printdiff(scalar(@lines1), scalar(@lines2)); + die "Lost sync!"; + } # Since we shouldn't get here unless the first lines of the # buffers are different, then we must discard some lines off @@ -220,7 +223,10 @@ sub checkmatch # treated as common; if that bugs you, use Algorithm::Diff. if ($lines1[$n1] eq $lines2[$n2] && $lines1[$n1+1] eq $lines2[$n2+1]) { printdiff($n1, $n2); + return 1; } + + return 0; } sub simple_diff @@ -240,6 +246,8 @@ sub simple_diff return if checkmatch($cnt, $n); } } + + printdiff(scalar(@lines1), scalar(@lines2)); die "Lost sync!"; } |