[7212] update diff-for-test-parsetexi.diff

[gavinsmith0123]

Revision: 7212
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7212
Author:   gavin
Date:     2016-06-09 20:11:47 +0000 (Thu, 09 Jun 2016)
Log Message:
-----------
update diff-for-test-parsetexi.diff

Modified Paths:
--------------
    trunk/tp/diff-for-test-parsetexi.diff

Modified: trunk/tp/diff-for-test-parsetexi.diff
===================================================================
--- trunk/tp/diff-for-test-parsetexi.diff       2016-06-09 20:01:57 UTC (rev 
7211)
+++ trunk/tp/diff-for-test-parsetexi.diff       2016-06-09 20:11:47 UTC (rev 
7212)
@@ -44,7 +44,7 @@
    if (!$libexec_dir) {
 Index: Texinfo/Parser.pm
 ===================================================================
---- Texinfo/Parser.pm  (revision 7191)
+--- Texinfo/Parser.pm  (revision 7197)
 +++ Texinfo/Parser.pm  (working copy)
 @@ -33,6 +33,9 @@
  use 5.006;
@@ -82,9 +82,9 @@
    }
 Index: Texinfo/Structuring.pm
 ===================================================================
---- Texinfo/Structuring.pm     (revision 7191)
+--- Texinfo/Structuring.pm     (revision 7208)
 +++ Texinfo/Structuring.pm     (working copy)
-@@ -581,11 +581,11 @@
+@@ -581,7 +581,7 @@
    foreach my $node (@{$self->{'nodes'}}) {
      if ($node->{'extra'}->{'normalized'} eq 'Top') {
        $top_node = $node;
@@ -93,11 +93,6 @@
                                                      $self->{'TOP_NODE_UP'});
        $top_node_up
          = {'type' => 'top_node_up',
--           'extra' => Texinfo::Parser::_parse_node_manual(
-+           'extra' => Texinfo::Common::parse_node_manual(
-                 {'contents' => $top_node_up_content_tree->{'contents'}})};
-     }
-     if ($node->{'menus'}) {
 @@ -804,7 +804,7 @@
                                                'extra' => $node_direction };
                $node->{'node_'.$direction}->{'extra'}->{'top_node_up'} 
@@ -109,7 +104,7 @@
                      $direction_texts{$direction},
 Index: t/test_utils.pl
 ===================================================================
---- t/test_utils.pl    (revision 7149)
+--- t/test_utils.pl    (revision 7208)
 +++ t/test_utils.pl    (working copy)
 @@ -43,7 +43,8 @@
  
@@ -121,15 +116,6 @@
  use Texinfo::Convert::Text;
  use Texinfo::Convert::Texinfo;
  use Texinfo::Structuring;
-@@ -374,7 +375,7 @@
-   my $test_name = shift;
-   my $trimmed = remove_keys($compared, $deleted_keys);
- no warnings 'recursion';
--  cmp_deeply($trimmed, $reference, $test_name);
-+  Test::Deep::cmp_deeply($trimmed, $reference, $test_name);
- }
- 
- sub new_test($;$$$)
 @@ -722,7 +723,8 @@
    #  push @tested_formats, @{$self->{'test_formats'}};
    }