texinfo/tp/t test_utils.pl results/macro/macro_...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/24 19:23:41

Modified files:
        tp/t           : test_utils.pl 
        tp/t/results/macro: macro_in_index_commands.pl 
        tp/t/results/misc_commands: index_entries.pl simple.pl 
        tp/t/results/value: value_in_index_commands.pl 

Log message:
        Put indices information in result file if there was a change in the 
        indices.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/index_entries.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/simple.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_index_commands.pl?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- test_utils.pl       24 Oct 2010 19:08:31 -0000      1.23
+++ test_utils.pl       24 Oct 2010 19:23:40 -0000      1.24
@@ -69,6 +69,9 @@
   # take the initial values to record only if there is something new
   my ($initial_index_names, $initial_merged_indices) 
     = $parser->indices_information();
+  # do a copy to compare the values and not the references
+  $initial_index_names = { %{$initial_index_names} };
+  $initial_merged_indices = { %{$initial_merged_indices} };
   print STDERR "  TEST $test_name\n" if ($self->{'debug'});
   my $result;
   if (ref($test_case) eq 'ARRAY') {

Index: results/macro/macro_in_index_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- results/macro/macro_in_index_commands.pl    24 Oct 2010 19:08:33 -0000      
1.10
+++ results/macro/macro_in_index_commands.pl    24 Oct 2010 19:23:41 -0000      
1.11
@@ -1928,7 +1928,61 @@
 ];
 
 
-$result_indices{'macro_in_index_commands'} = undef;
+$result_indices{'macro_in_index_commands'} = {
+  'index_names' => {
+    'abc' => {
+      'abc' => 0
+    },
+    'codeidx' => {
+      'codeidx' => 1
+    },
+    'cp' => {
+      'c' => 0,
+      'cp' => 0
+    },
+    'defg' => {
+      'abc' => 0,
+      'defg' => 0
+    },
+    'fn' => {
+      'c' => 1,
+      'cp' => 1,
+      'f' => 1,
+      'fn' => 1,
+      'truc' => 0
+    },
+    'ky' => {
+      'k' => 1,
+      'ky' => 1
+    },
+    'pg' => {
+      'abc' => 0,
+      'defg' => 0,
+      'k' => 1,
+      'ky' => 1,
+      'p' => 1,
+      'pg' => 1
+    },
+    'tp' => {
+      't' => 1,
+      'tp' => 1
+    },
+    'truc' => {
+      'truc' => 0
+    },
+    'vr' => {
+      'v' => 1,
+      'vr' => 1
+    }
+  },
+  'merged_indices' => {
+    'abc' => 'defg',
+    'cp' => 'fn',
+    'defg' => 'pg',
+    'ky' => 'pg',
+    'truc' => 'fn'
+  }
+};
 
 
 1;

Index: results/misc_commands/index_entries.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/index_entries.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- results/misc_commands/index_entries.pl      24 Oct 2010 19:08:34 -0000      
1.10
+++ results/misc_commands/index_entries.pl      24 Oct 2010 19:23:41 -0000      
1.11
@@ -136,7 +136,37 @@
 $result_errors{'index_entries'} = [];
 
 
-$result_indices{'index_entries'} = undef;
+$result_indices{'index_entries'} = {
+  'index_names' => {
+    'cp' => {
+      'c' => 0,
+      'cp' => 0
+    },
+    'fn' => {
+      'f' => 1,
+      'fn' => 1
+    },
+    'ky' => {
+      'k' => 1,
+      'ky' => 1
+    },
+    'pg' => {
+      'p' => 1,
+      'pg' => 1
+    },
+    'tp' => {
+      't' => 1,
+      'tp' => 1
+    },
+    'truc' => {
+      'truc' => 0
+    },
+    'vr' => {
+      'v' => 1,
+      'vr' => 1
+    }
+  }
+};
 
 
 1;

Index: results/misc_commands/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/simple.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- results/misc_commands/simple.pl     24 Oct 2010 19:08:34 -0000      1.8
+++ results/misc_commands/simple.pl     24 Oct 2010 19:23:41 -0000      1.9
@@ -44,7 +44,37 @@
 $result_errors{'simple'} = [];
 
 
-$result_indices{'simple'} = undef;
+$result_indices{'simple'} = {
+  'index_names' => {
+    'cp' => {
+      'c' => 0,
+      'cp' => 0
+    },
+    'fn' => {
+      'f' => 1,
+      'fn' => 1
+    },
+    'idx' => {
+      'idx' => 0
+    },
+    'ky' => {
+      'k' => 1,
+      'ky' => 1
+    },
+    'pg' => {
+      'p' => 1,
+      'pg' => 1
+    },
+    'tp' => {
+      't' => 1,
+      'tp' => 1
+    },
+    'vr' => {
+      'v' => 1,
+      'vr' => 1
+    }
+  }
+};
 
 
 1;

Index: results/value/value_in_index_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- results/value/value_in_index_commands.pl    24 Oct 2010 19:08:35 -0000      
1.8
+++ results/value/value_in_index_commands.pl    24 Oct 2010 19:23:41 -0000      
1.9
@@ -1610,7 +1610,61 @@
 $result_errors{'value_in_index_commands'} = [];
 
 
-$result_indices{'value_in_index_commands'} = undef;
+$result_indices{'value_in_index_commands'} = {
+  'index_names' => {
+    'abc' => {
+      'abc' => 0
+    },
+    'codeidx' => {
+      'codeidx' => 1
+    },
+    'cp' => {
+      'c' => 0,
+      'cp' => 0
+    },
+    'defg' => {
+      'abc' => 0,
+      'defg' => 0
+    },
+    'fn' => {
+      'c' => 1,
+      'cp' => 1,
+      'f' => 1,
+      'fn' => 1,
+      'truc' => 0
+    },
+    'ky' => {
+      'k' => 1,
+      'ky' => 1
+    },
+    'pg' => {
+      'abc' => 0,
+      'defg' => 0,
+      'k' => 1,
+      'ky' => 1,
+      'p' => 1,
+      'pg' => 1
+    },
+    'tp' => {
+      't' => 1,
+      'tp' => 1
+    },
+    'truc' => {
+      'truc' => 0
+    },
+    'vr' => {
+      'v' => 1,
+      'vr' => 1
+    }
+  },
+  'merged_indices' => {
+    'abc' => 'defg',
+    'cp' => 'fn',
+    'defg' => 'pg',
+    'ky' => 'pg',
+    'truc' => 'fn'
+  }
+};
 
 
 1;